diff --git a/submodules/users/users.js b/submodules/users/users.js
index 35b0801..2c46e60 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1685,37 +1685,31 @@ define(function(require) {
 			monster.pub('common.numberSelector.render', {
 				container: featureTemplate.find('.number-select'),
 				inputName: 'caller_id',
-				number: data.hasOwnProperty('faxbox') ? data.faxbox.caller_id : undefined,
-				removeCallback: function() {
-					featureTemplate
-						.find('.number-mirror')
-							.text(self.i18n.active().users.faxing.emailToFax.default);
-				},
-				globalAddNumberCallback: function(number, addNumberToControl) {
-					// Number can come back from the buy common control, as an object, or from the spare selector, as a string
-					var foundNumber = _.isObject(number) ? _.keys(number)[0] : number;
-
-					addNumberToControl && addNumberToControl(foundNumber);
-
-					featureTemplate
-						.find('.number-mirror')
-							.text(foundNumber);
-				}
+				number: data.hasOwnProperty('faxbox') ? data.faxbox.caller_id : undefined
 			});
 
 			featureTemplate.find('#helper_content').on('shown', function() {
 				$(this).siblings('a').find('.text').text(self.i18n.active().users.faxing.emailToFax.help.hideHelp);
-				$(this).find('#destination_number').focus();
+				featureTemplate.find('#destination_number').focus();
 			});
 
 			featureTemplate.find('#helper_content').on('hidden', function() {
 				$(this).siblings('a').find('.text').text(self.i18n.active().users.faxing.emailToFax.help.showHelp);
+				featureTemplate.find('#destination_number').val('');
+				featureTemplate.find('.number-mirror').text(self.i18n.active().users.faxing.emailToFax.default);
 			});
 
 			featureTemplate.find('.cancel-link').on('click', function() {
 				popup.dialog('close').remove();
 			});
 
+			featureTemplate.find('#destination_number').on('keyup', function() {
+				var val = $(this).val(),
+					textToMirror = val === '' ? self.i18n.active().users.faxing.emailToFax.default : val;
+
+				featureTemplate.find('.number-mirror').text(textToMirror);
+			});
+
 			featureTemplate.find('.save').on('click', function() {
 				var newNumber = featureTemplate.find('input[name="caller_id"]').val(),
 					args = {
diff --git a/views/users-feature-faxing.html b/views/users-feature-faxing.html
index d3227e8..62e3a27 100644
--- a/views/users-feature-faxing.html
+++ b/views/users-feature-faxing.html
@@ -25,10 +25,10 @@
 				<legend>{{i18n.users.faxing.emailToFax.title}}</legend>
 				<p>
 					{{i18n.users.faxing.emailToFax.text1}}
-					<strong><em><span class="number-mirror">{{#if faxbox}}{{faxbox.caller_id}}{{else}}{{i18n.users.faxing.emailToFax.default}}{{/if}}</span></em></strong>
+					<strong><em><span class="number-mirror">{{i18n.users.faxing.emailToFax.default}}</span></em></strong>
 					<strong class="monster-primary-color">@{{account.realm}}</strong>
 					{{i18n.users.faxing.emailToFax.text2}}
-					<strong><em><span class="number-mirror">{{#if faxbox}}{{faxbox.caller_id}}{{else}}{{i18n.users.faxing.emailToFax.default}}{{/if}}</span></em></strong>.
+					<strong><em><span class="number-mirror">{{i18n.users.faxing.emailToFax.default}}</span></em></strong>.
 					<br>
 					{{i18n.users.faxing.emailToFax.text3}}
 					<strong class="monster-primary-color">{{user.email}}</strong>.