diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 4ade4b7..df31f5b 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -269,7 +269,9 @@ define(function(require){
 				mode = data.id ? 'edit' : 'add',
 				type = data.device_type,
 				popupTitle = mode === 'edit' ? monster.template(self, '!' + self.i18n.active().devices[type].editTitle, { name: data.name }) : self.i18n.active().devices[type].addTitle,
-				templateDevice = $(monster.template(self, 'devices-'+type, data)),
+				templateDevice = $(monster.template(self, 'devices-'+type, $.extend(true, {}, data, {
+					isE911Enabled: monster.util.isNumberFeatureEnabled('e911')
+				}))),
 				deviceForm = templateDevice.find('#form_device');
 
 			if (data.hasOwnProperty('provision') && data.provision.hasOwnProperty('feature_keys')) {
diff --git a/views/devices-ata.html b/views/devices-ata.html
index 0b49a58..4b8fab6 100644
--- a/views/devices-ata.html
+++ b/views/devices-ata.html
@@ -23,7 +23,9 @@
 				<ul class="dropdown-menu pull-right">
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{#if isE911Enabled}}
+						<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{/if}}
 				</ul>
 			</li>
 		</ul>
@@ -113,22 +115,24 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 		</form>
 	</div>
 
diff --git a/views/devices-fax.html b/views/devices-fax.html
index 677b089..6639ed4 100644
--- a/views/devices-fax.html
+++ b/views/devices-fax.html
@@ -23,7 +23,9 @@
 				<ul class="dropdown-menu pull-right">
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{#if isE911Enabled}}
+						<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{/if}}
 				</ul>
 			</li>
 		</ul>
@@ -133,22 +135,24 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 		</form>
 	</div>
 
diff --git a/views/devices-mobile.html b/views/devices-mobile.html
index 9073202..8715c62 100644
--- a/views/devices-mobile.html
+++ b/views/devices-mobile.html
@@ -24,7 +24,9 @@
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-video-camera"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{#if isE911Enabled}}
+						<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{/if}}
 					<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="fa fa-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>
 				</ul>
 			</li>
@@ -135,22 +137,24 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 
 			<div class="tabs-section clearfix" data-section="miscellaneous">
 				<div class="title">
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index 3e338af..9c6529b 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -32,7 +32,9 @@
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-video-camera"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{#if isE911Enabled}}
+						<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{/if}}
 					<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="fa fa-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>
 				{{#if provision.feature_keys}}
 					<li><a class="tabs-selector change-section" data-section="featureKeys" href="javascript:void(0);"><i class="fa fa-lightbulb-o"></i>{{ i18n.devices.popupSettings.featureKeys.menuTitle }}</a></li>
@@ -172,28 +174,30 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-					<div class="control-group number-address">
-						<label class="control-label">{{i18n.devices.popupSettings.callerId.address}}</label>
-						<div class="controls">
-							<p></p>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
 						</div>
-					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+						<div class="control-group number-address">
+							<label class="control-label">{{i18n.devices.popupSettings.callerId.address}}</label>
+							<div class="controls">
+								<p></p>
+							</div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 
 			<div class="tabs-section clearfix" data-section="miscellaneous">
 				<div class="title">
diff --git a/views/devices-softphone.html b/views/devices-softphone.html
index 9d51936..09c7564 100644
--- a/views/devices-softphone.html
+++ b/views/devices-softphone.html
@@ -24,7 +24,9 @@
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-video-camera"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{#if isE911Enabled}}
+						<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
+					{{/if}}
 					<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="fa fa-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>
 				</ul>
 			</li>
@@ -129,28 +131,30 @@
 				</div>
 			</div>
 
-			<div class="tabs-section clearfix" data-section="callerId">
-				<div class="title">
-					{{ i18n.devices.popupSettings.callerId.sectionTitle }}
-				</div>
-
-				{{#if extra.hasE911Numbers}}
-					<div class="control-group">
-						<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
-						<div class="controls emergency-number"></div>
+			{{#if isE911Enabled}}
+				<div class="tabs-section clearfix" data-section="callerId">
+					<div class="title">
+						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
 					</div>
-					<div class="control-group number-address">
-						<label class="control-label">{{i18n.devices.popupSettings.callerId.address}}</label>
-						<div class="controls">
-							<p></p>
+
+					{{#if extra.hasE911Numbers}}
+						<div class="control-group">
+							<label class="control-label">{{ i18n.devices.popupSettings.callerId.emergency }}</label>
+							<div class="controls emergency-number"></div>
 						</div>
-					</div>
-				{{else}}
-					{{#monsterText 'error'}}
-						{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-					{{/monsterText}}
-				{{/if}}
-			</div>
+						<div class="control-group number-address">
+							<label class="control-label">{{i18n.devices.popupSettings.callerId.address}}</label>
+							<div class="controls">
+								<p></p>
+							</div>
+						</div>
+					{{else}}
+						{{#monsterText 'error'}}
+							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
+						{{/monsterText}}
+					{{/if}}
+				</div>
+			{{/if}}
 
 			<div class="tabs-section clearfix" data-section="miscellaneous">
 				<div class="title">