diff --git a/submodules/users/users.js b/submodules/users/users.js
index 90c4bab..42ee869 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -2457,6 +2457,10 @@ define(function(require) {
 				} else if (user.call_forward.enabled === false) {
 					cfMode = user.call_forward.hasOwnProperty('failover') && user.call_forward.failover === true ? 'failover' : 'off';
 				}
+
+				if (_.has(user.call_forward, 'number')) {
+					user.call_forward.number = monster.util.unformatPhoneNumber(user.call_forward.number);
+				}
 			}
 
 			user.extra.callForwardMode = cfMode;
@@ -2513,8 +2517,11 @@ define(function(require) {
 			});
 
 			featureTemplate.find('.save').on('click', function() {
-				if (monster.ui.valid(featureForm)) {
-					var formData = monster.ui.getFormData('call_forward_form');
+				var formData = monster.ui.getFormData('call_forward_form'),
+					phoneNumber = monster.util.getFormatPhoneNumber(formData.number).e164Number,
+					isValidPhoneNumber = !_.isUndefined(phoneNumber);
+
+				if (monster.ui.valid(featureForm) && isValidPhoneNumber) {
 					formData.require_keypress = !formData.require_keypress;
 
 					var selectedType = featureTemplate.find('.feature-select-mode button.selected').data('value');
@@ -2529,7 +2536,7 @@ define(function(require) {
 						formData.failover = false;
 					}
 
-					formData.number = monster.util.unformatPhoneNumber(formData.number, 'keepPlus');
+					formData.number = phoneNumber;
 					delete formData.phoneType;
 
 					var userToSave = $.extend(true, {}, currentUser, { call_forward: formData });
@@ -2538,6 +2545,7 @@ define(function(require) {
 						args.openedTab = 'name';
 					}
 
+
 					self.usersUpdateUser(userToSave, function(data) {
 						args.userId = data.data.id;