diff --git a/i18n/en-US.json b/i18n/en-US.json
index 23b3fd2..96b2e32 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -635,7 +635,7 @@
 		"__version": "3.19",
 		"presenceIDPopup": {
 			"title": "Select your new Main Extension",
-			"header": "It appears that you want to remove the number you had set as your Main Extension. Please select your new Main Extension from the choices below:",
+			"header": "It appears that you don't have a valid Main Extension configured. Please select your Main Extension from the choices below:",
 			"none": "I don't want to set a new Main Extension"
 		},
 		"__comment": "UI-1393: Updating user devices to use the monsterListing common control",
diff --git a/submodules/users/users.css b/submodules/users/users.css
index f7c6bf2..6b062c1 100644
--- a/submodules/users/users.css
+++ b/submodules/users/users.css
@@ -877,4 +877,8 @@
 
 .presence-id-change-wrapper .actions {
 	margin-top: 10px;
+}
+
+.presence-id-change-wrapper #save-presence-id {
+	margin-left: 5px;
 }
\ No newline at end of file
diff --git a/submodules/users/users.js b/submodules/users/users.js
index 3f0d37f..52e464e 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -712,7 +712,8 @@ define(function(require){
 									callback: function() {
 										updateCallflow();
 									},
-									oldPresenceId: oldPresenceId
+									oldPresenceId: oldPresenceId,
+									userExtension: extensionsList[0]
 								});
 							});
 						});
@@ -1505,10 +1506,12 @@ define(function(require){
 
 				return found;
 			}
+			else if(listNumbers.length) {
+				return false;
+			}
 			else {
 				return true;
 			}
-			
 		},
 
 		usersFormatAddUser: function(data) {
@@ -4029,7 +4032,8 @@ define(function(require){
 				user = args.user,
 				needVMUpdate = args.needVMUpdate || true,
 				callback = args.callback,
-				oldPresenceId = args.oldPresenceId || undefined;
+				oldPresenceId = args.oldPresenceId || undefined,
+				userExtension = args.userExtension;
 
 			self.usersListVMBoxesUser(user.id, function(vmboxes) {
 				if(vmboxes.length > 0) {
@@ -4055,7 +4059,7 @@ define(function(require){
 				else {
 					var vmbox = {
 						owner_id: user.id,
-						mailbox: user.presence_id || user.extra.vmbox.mailbox,
+						mailbox: user.presence_id || userExtension || user.extra.vmbox.mailbox,
 						name: user.first_name + ' ' + user.last_name + '\'s VMBox'
 					};