diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 088f891f..041aabe0 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -546,6 +546,10 @@ define(function(require){
 					require_keypress: true,
 					keep_caller_id: true
 				}, formData.call_forward);
+
+				if (originalData.device_type === 'smartphone') {
+					formData.call_forward.failover = true;
+				}
 			}
 
 			if(hasCodecs) {
diff --git a/submodules/users/users.js b/submodules/users/users.js
index 0f73fd68..434b36b9 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1039,7 +1039,7 @@ define(function(require){
 						}
 					};
 
-				if (deviceData.type === 'mobile') {
+				if (deviceData && deviceData.type === 'mobile') {
 					monster.ui.confirm(
 						self.i18n.active().users.confirmMobileUnAssignment.replace(
 							'{{variable}}',