diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 281877b..34bc4f6 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -270,7 +270,7 @@ define(function(require){
 				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, $.extend(true, {}, data, {
-					isE911Enabled: monster.util.isNumberFeatureEnabled('e911')
+					showEmergencyCnam: monster.util.isNumberFeatureEnabled('cnam') && monster.util.isNumberFeatureEnabled('e911')
 				}))),
 				deviceForm = templateDevice.find('#form_device');
 
diff --git a/views/devices-ata.html b/views/devices-ata.html
index 4b8fab6..57e68c5 100644
--- a/views/devices-ata.html
+++ b/views/devices-ata.html
@@ -23,7 +23,7 @@
 				<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>
-					{{#if isE911Enabled}}
+					{{#if showEmergencyCnam}}
 						<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>
@@ -115,7 +115,7 @@
 				</div>
 			</div>
 
-			{{#if isE911Enabled}}
+			{{#if showEmergencyCnam}}
 				<div class="tabs-section clearfix" data-section="callerId">
 					<div class="title">
 						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
diff --git a/views/devices-fax.html b/views/devices-fax.html
index 6639ed4..bfbc15b 100644
--- a/views/devices-fax.html
+++ b/views/devices-fax.html
@@ -23,7 +23,7 @@
 				<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>
-					{{#if isE911Enabled}}
+					{{#if showEmergencyCnam}}
 						<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>
@@ -135,7 +135,7 @@
 				</div>
 			</div>
 
-			{{#if isE911Enabled}}
+			{{#if showEmergencyCnam}}
 				<div class="tabs-section clearfix" data-section="callerId">
 					<div class="title">
 						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
diff --git a/views/devices-mobile.html b/views/devices-mobile.html
index 8715c62..deb78c5 100644
--- a/views/devices-mobile.html
+++ b/views/devices-mobile.html
@@ -24,7 +24,7 @@
 					<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>
-					{{#if isE911Enabled}}
+					{{#if showEmergencyCnam}}
 						<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>
@@ -137,7 +137,7 @@
 				</div>
 			</div>
 
-			{{#if isE911Enabled}}
+			{{#if showEmergencyCnam}}
 				<div class="tabs-section clearfix" data-section="callerId">
 					<div class="title">
 						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index 9c6529b..f39d78e 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -32,7 +32,7 @@
 					<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>
-					{{#if isE911Enabled}}
+					{{#if showEmergencyCnam}}
 						<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>
@@ -174,7 +174,7 @@
 				</div>
 			</div>
 
-			{{#if isE911Enabled}}
+			{{#if showEmergencyCnam}}
 				<div class="tabs-section clearfix" data-section="callerId">
 					<div class="title">
 						{{ i18n.devices.popupSettings.callerId.sectionTitle }}
diff --git a/views/devices-softphone.html b/views/devices-softphone.html
index 09c7564..705dbec 100644
--- a/views/devices-softphone.html
+++ b/views/devices-softphone.html
@@ -24,7 +24,7 @@
 					<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>
-					{{#if isE911Enabled}}
+					{{#if showEmergencyCnam}}
 						<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>
@@ -131,7 +131,7 @@
 				</div>
 			</div>
 
-			{{#if isE911Enabled}}
+			{{#if showEmergencyCnam}}
 				<div class="tabs-section clearfix" data-section="callerId">
 					<div class="title">
 						{{ i18n.devices.popupSettings.callerId.sectionTitle }}