diff --git a/submodules/myOffice/myOffice.css b/submodules/myOffice/myOffice.css
index 58b2a0b..df9d213 100644
--- a/submodules/myOffice/myOffice.css
+++ b/submodules/myOffice/myOffice.css
@@ -425,6 +425,10 @@
 	margin-top: 5px;
 }
 
+#my_office_caller_id_popup .number-feature {
+	display: none;
+}
+
 #myoffice_container .warning-pulse-box {
 	-webkit-animation: "warning-pulse-box" 1s ease-in-out 0 infinite alternate;
 
diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js
index eeb3728..f2f2527 100644
--- a/submodules/myOffice/myOffice.js
+++ b/submodules/myOffice/myOffice.js
@@ -847,8 +847,15 @@ define(function(require){
 				emergencyAddress2Input = popupTemplate.find('.caller-id-emergency-address2'),
 				emergencyCityInput = popupTemplate.find('.caller-id-emergency-city'),
 				emergencyStateInput = popupTemplate.find('.caller-id-emergency-state'),
-				loadNumberDetails = function(number, callback) {
-					var allowedFeatures = [];
+				loadNumberDetails = function(number, popupTemplate) {
+					var allowedFeatures = [],
+						callback = function(features) {
+							popupTemplate.find('.number-feature').hide();
+							_.each(features, function(featureName) {
+								popupTemplate.find('.number-feature[data-feature="'+ featureName + '"]').slideDown();
+							});
+						};
+
 					if(number) {
 						self.myOfficeGetNumber(number, function(numberData) {
 							var availableFeatures = numberData.hasOwnProperty('_read_only') && numberData._read_only.hasOwnProperty('features_available') ? numberData._read_only.features_available : [],
@@ -903,16 +910,7 @@ define(function(require){
 			});
 
 			callerIdNumberSelect.on('change', function() {
-				var selectedNumber = $(this).val();
-				if(selectedNumber) {
-					loadNumberDetails(selectedNumber, function(features) {
-						_.each(features, function(featureName) {
-							popupTemplate.find('.number-feature[data-feature="'+ featureName + '"]').slideDown();
-						});
-					});
-				} else {
-					popupTemplate.find('.number-feature').slideUp();
-				}
+				loadNumberDetails($(this).val(), popupTemplate);
 			});
 
 			emergencyZipcodeInput.on('blur', function() {
@@ -935,7 +933,9 @@ define(function(require){
 						});
 					},
 					setNumberData = function (e911Data) {
-						var callerIdName = callerIdNameInput.val();
+						var callerIdName = callerIdNameInput.val(),
+							setCNAM = popupTemplate.find('.number-feature[data-feature="cnam"]').is(':visible'),
+							setE911 = popupTemplate.find('.number-feature[data-feature="e911"]').is(':visible');
 
 						account.caller_id = $.extend(true, {}, account.caller_id, {
 							external: {
@@ -947,17 +947,21 @@ define(function(require){
 						});
 
 						self.myOfficeGetNumber(callerIdNumber, function(numberData) {
-							if(callerIdNumber) {
+							if(setCNAM && callerIdName.length) {
 								$.extend(true, numberData, { cnam: { display_name: callerIdName } });
-							} else {
+							}
+							else {
 								delete numberData.cnam;
 							}
 
-							if(e911Data) {
+							if(setE911) {
 								$.extend(true, numberData, {
 									e911: e911Data
 								});
 							}
+							else {
+								delete numberData.e911;
+							}
 
 							self.myOfficeUpdateNumber(numberData, function(data) {
 								updateAccount();
@@ -992,7 +996,7 @@ define(function(require){
 				}
 			});
 
-			loadNumberDetails(callerIdNumberSelect.val());
+			loadNumberDetails(callerIdNumberSelect.val(), popupTemplate);
 		},
 
 		myOfficeWalkthroughRender: function() {
diff --git a/views/myOffice-callerIdPopup.html b/views/myOffice-callerIdPopup.html
index 564c272..2b36213 100644
--- a/views/myOffice-callerIdPopup.html
+++ b/views/myOffice-callerIdPopup.html
@@ -22,7 +22,7 @@
 		{{/monsterText}}
 	</div>
 
-	<div class="content number-feature" data-feature="cnam" {{#compare selectedMainNumber '===' 'none'}}style="display:none;"{{/compare}}>
+	<div class="content number-feature" data-feature="cnam">
 		<div>
 			{{ i18n.myOffice.callerId.nameLabel }}
 			<input type="text" class="caller-id-name">
@@ -34,7 +34,7 @@
 	</div>
 
 	{{#if isE911Enabled}}
-	<div class="content number-feature" data-feature="e911" {{#compare selectedMainNumber '===' 'none'}}style="display:none;"{{/compare}}>
+	<div class="content number-feature" data-feature="e911">
 		<div>
 			<div>{{ i18n.myOffice.callerId.emergencyLabel }}</div>
 			<div class="emergency-form">