diff --git a/app/voicemails/resources/classes/voicemail.php b/app/voicemails/resources/classes/voicemail.php
index deb8d00d0a..9f52eaec8e 100644
--- a/app/voicemails/resources/classes/voicemail.php
+++ b/app/voicemails/resources/classes/voicemail.php
@@ -43,7 +43,12 @@
 
 			//set the voicemail_id array
 				foreach ($_SESSION['user']['extension'] as $value) {
-					$voicemail_ids[]['voicemail_id'] = $value['user'];
+					if (strlen($row['number_alias']) > 0) {
+						$voicemail_ids[]['voicemail_id'] = $row['number_alias'];
+					}
+					else {
+						$voicemail_ids[]['voicemail_id'] = $row['user'];
+					}
 				}
 
 			//get the uuid and voicemail_id
diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php
index d91e9ebca4..cc7c74f95a 100644
--- a/app/voicemails/voicemails.php
+++ b/app/voicemails/voicemails.php
@@ -33,6 +33,7 @@ else {
 	echo "access denied";
 	exit;
 }
+
 //add multi-lingual support
 	require_once "app_languages.php";
 	foreach($text as $key => $value) {
@@ -41,7 +42,12 @@ else {
 
 //set the voicemail_id array
 	foreach ($_SESSION['user']['extension'] as $value) {
-		$voicemail_ids[]['voicemail_id'] = $value['user'];
+		if (strlen($row['number_alias']) > 0) {
+			$voicemail_ids[]['voicemail_id'] = $row['number_alias'];
+		}
+		else {
+			$voicemail_ids[]['voicemail_id'] = $row['user'];
+		}
 	}
 
 //get the http values and set them as variables
diff --git a/resources/switch.php b/resources/switch.php
index 69d5bceae8..2b0d524acc 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -178,6 +178,7 @@ function load_extensions() {
 					$x = 0;
 					foreach($result as $row) {
 						$_SESSION['user']['extension'][$x]['user'] = $row['extension'];
+						$_SESSION['user']['extension'][$x]['number_alias'] = $row['number_alias'];
 						$_SESSION['user']['extension'][$x]['extension_uuid'] = $row['extension_uuid'];
 						$_SESSION['user']['extension'][$x]['outbound_caller_id_name'] = $row['outbound_caller_id_name'];
 						$_SESSION['user']['extension'][$x]['outbound_caller_id_number'] = $row['outbound_caller_id_number'];