diff --git a/src/apps/callflows/submodules/user/user.js b/src/apps/callflows/submodules/user/user.js
index b0bef32..0edea40 100644
--- a/src/apps/callflows/submodules/user/user.js
+++ b/src/apps/callflows/submodules/user/user.js
@@ -994,30 +994,31 @@ define(function(require) {
 			}
 		},
 
-		userCleanFormData: function(form_data) {
-			form_data.caller_id.internal.number = form_data.caller_id.internal.number.replace(/\s|\(|\)|-|\./g, '');
-			form_data.caller_id.external.number = form_data.caller_id.external.number.replace(/\s|\(|\)|-|\./g, '');
-			form_data.caller_id.emergency.number = form_data.caller_id.emergency.number.replace(/\s|\(|\)|-|\./g, '');
-			form_data.caller_id.asserted.number = _.isEmpty(form_data.caller_id.asserted.number)
-				? ''	// Need to keep the empty string so the new value is not lost when merging the form data with the original data
-				: monster.util.getFormatPhoneNumber(form_data.caller_id.asserted.number).e164Number;
-
-			form_data.call_restriction.closed_groups = { action: form_data.extra.closed_groups ? 'deny' : 'inherit' };
-
-			if (!form_data.hotdesk.require_pin) {
-				delete form_data.hotdesk.pin;
-			}
+        userCleanFormData: function(form_data) {
+            form_data.caller_id.internal.number = form_data.caller_id.internal.number.replace(/\s|\(|\)|-|\./g, '');
+            form_data.caller_id.external.number = form_data.caller_id.external.number.replace(/\s|\(|\)|-|\./g, '');
+            form_data.caller_id.emergency.number = form_data.caller_id.emergency.number.replace(/\s|\(|\)|-|\./g, '');
 
-			if (form_data.pwd_mngt_pwd1 !== 'fakePassword') {
-				form_data.password = form_data.pwd_mngt_pwd1;
-			}
+            form_data.call_restriction.closed_groups = { action: form_data.extra.closed_groups ? 'deny' : 'inherit' };
 
-			delete form_data.pwd_mngt_pwd1;
-			delete form_data.pwd_mngt_pwd2;
-			delete form_data.extra;
+            if (!_.chain(form_data.caller_id).get('asserted.number', '').isEmpty().value()) {
+                form_data.caller_id.asserted.number = monster.util.getFormatPhoneNumber(form_data.caller_id.asserted.number).e164Number;
+            }
 
-			return form_data;
-		},
+            if (!form_data.hotdesk.require_pin) {
+                delete form_data.hotdesk.pin;
+            }
+
+            if (form_data.pwd_mngt_pwd1 !== 'fakePassword') {
+                form_data.password = form_data.pwd_mngt_pwd1;
+            }
+
+            delete form_data.pwd_mngt_pwd1;
+            delete form_data.pwd_mngt_pwd2;
+            delete form_data.extra;
+
+            return form_data;
+        },
 
 		userSave: function(form_data, data, success, error) {
 			var self = this,
diff --git a/src/apps/callflows/submodules/user/views/edit.html b/src/apps/callflows/submodules/user/views/edit.html
index b2d05ff..6cd4c27 100644
--- a/src/apps/callflows/submodules/user/views/edit.html
+++ b/src/apps/callflows/submodules/user/views/edit.html
@@ -17,9 +17,6 @@
 		<li><a href="#caller_id">{{ i18n.callflows.user.caller_id }}</a></li>
 		<li><a href="#options">{{ i18n.callflows.user.options }}</a></li>
 		<li><a href="#call_forward">{{ i18n.callflows.user.call_forward }}</a></li>
-		{{#unless _whitelabel.hide_user_passwords}}
-			<li><a href="#password_management">{{ i18n.callflows.user.password_management }}</a></li>
-		{{/unless}}
 		<li><a href="#hot_desking">{{ i18n.callflows.user.hot_desking }}</a></li>
 		<li><a href="#restrictions">{{ i18n.callflows.user.restrictions }}</a></li>
 	</ul>
@@ -90,6 +87,22 @@
 					</div>
 				</div>
 
+				<div class="clearfix">
+					<label for="pwd_mngt_pwd1">{{ i18n.callflows.user.new_password }}</label>
+					<div class="input">
+						<input class="span4" id="pwd_mngt_pwd1" name="pwd_mngt_pwd1" type="password"
+							   value="{{#unless field_data.new_user}}fakePassword{{/unless}}"/>
+					</div>
+				</div>
+
+				<div class="clearfix">
+					<label for="pwd_mngt_pwd2">{{ i18n.callflows.user.confirm_password }}</label>
+					<div class="input">
+						<input class="span4" id="pwd_mngt_pwd2" name="pwd_mngt_pwd2" type="password"
+							   value="{{#unless field_data.new_user}}fakePassword{{/unless}}"/>
+					</div>
+				</div>
+
 				<hr />
 
 				<h3>{{ i18n.callflows.user.in_house_calls }}</h3>
@@ -158,7 +171,7 @@
 
 			<div id="caller_id">
 				<div class="clearfix">
-					<label for="name">{{ i18n.callflows.user.presence_id }}</label>
+					<label for="presence_id">{{ i18n.callflows.user.presence_id }}</label>
 					<div class="input">
 						<input class="span4" id="presence_id" name="presence_id" type="text" placeholder="{{ i18n.callflows.user.presence_id_placeholder }}" value="{{data.presence_id}}" rel="popover" data-content="{{ i18n.callflows.user.presence_id_help }}"/>
 					</div>
@@ -484,24 +497,6 @@
 				</div>
 			</div>
 
-			{{#unless _whitelabel.hide_user_passwords}}
-				<div id="password_management">
-					<div class="clearfix">
-						<label for="pwd_mngt_pwd1">{{ i18n.callflows.user.new_password }}</label>
-						<div class="input">
-							<input class="span4" id="pwd_mngt_pwd1" name="pwd_mngt_pwd1" type="password" value="fakePassword"/>
-						</div>
-					</div>
-
-					<div class="clearfix">
-						<label for="pwd_reco_pwd2">{{ i18n.callflows.user.confirm_password }}</label>
-						<div class="input">
-							<input class="span4" id="pwd_mngt_pwd2" name="pwd_mngt_pwd2" type="password" value="fakePassword"/>
-						</div>
-					</div>
-				</div>
-			{{/unless}}
-
 			<div id="hot_desking">
 				<div class="clearfix">
 					<div class="input">