diff --git a/src/ic/edit-ic.js b/src/ic/edit-ic.js
index 404642c..e91c8ef 100644
--- a/src/ic/edit-ic.js
+++ b/src/ic/edit-ic.js
@@ -31,6 +31,7 @@ class EditICDialog extends React.Component {
     this.state = {
       name: '',
       host: '',
+      apihost: '',
       type: '',
       category: '',
       properties: {},
@@ -50,6 +51,10 @@ class EditICDialog extends React.Component {
           data.host = this.state.host;
         }
 
+        if (this.state.apihost != null && this.state.apihost !== "" && this.state.apihost !== "http://" && this.state.apihost !== this.props.ic.apihost) {
+          data.apihost = this.state.apihost;
+        }
+
         if (this.state.type != null && this.state.type !== "" && this.state.type !== this.props.ic.type) {
           data.type = this.state.type;
         }
@@ -77,6 +82,7 @@ class EditICDialog extends React.Component {
     this.setState({
       name: this.props.ic.name,
       host: this.props.ic.host,
+      apihost: this.props.ic.apihost,
       type: this.props.ic.type,
       category: this.props.ic.category,
       properties: _.merge({}, _.get(this.props.ic, 'rawProperties'), _.get(this.props.ic, 'properties'))
@@ -97,6 +103,11 @@ class EditICDialog extends React.Component {
             <FormControl type="text" placeholder={this.props.ic.host} value={this.state.host || 'http://' } onChange={(e) => this.handleChange(e)} />
             <FormControl.Feedback />
           </FormGroup>
+          <FormGroup controlId="apihost">
+            <FormLabel column={false}>API Host</FormLabel>
+            <FormControl type="text" placeholder={this.props.ic.apihost} value={this.state.apihost || 'http://' } onChange={(e) => this.handleChange(e)} />
+            <FormControl.Feedback />
+          </FormGroup>
           <FormGroup controlId="category">
             <FormLabel column={false}>Category (e.g. Simulator, Gateway, ...)</FormLabel>
             <FormControl type="text" placeholder={this.props.ic.category} value={this.state.category} onChange={(e) => this.handleChange(e)} />
diff --git a/src/ic/ics.js b/src/ic/ics.js
index e24cd93..5cd7719 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -280,6 +280,7 @@ class InfrastructureComponents extends Component {
           <TableColumn title='Location' dataKeys={['properties.location', 'rawProperties.location']} />
           {/* <TableColumn title='Realm' dataKeys={['properties.realm', 'rawProperties.realm']} /> */}
           <TableColumn title='Host' dataKey='host' />
+          <TableColumn title='API Host' dataKey='apihost' />
           <TableColumn title='Last Update' dataKey='stateUpdatedAt' modifier={InfrastructureComponents.stateUpdateModifier} />
           <TableColumn
             width='200'