diff --git a/resources/install/scripts/app/voicemail/index.lua b/resources/install/scripts/app/voicemail/index.lua
index f37d95453c..c200b67ba7 100644
--- a/resources/install/scripts/app/voicemail/index.lua
+++ b/resources/install/scripts/app/voicemail/index.lua
@@ -82,6 +82,7 @@
 			destination_number = session:getVariable("destination_number");
 			caller_id_name = session:getVariable("caller_id_name");
 			caller_id_number = session:getVariable("caller_id_number");
+			voicemail_greeting_number = session:getVariable("voicemail_greeting_number");
 			skip_instructions = session:getVariable("skip_instructions");
 			skip_greeting = session:getVariable("skip_greeting");
 			vm_message_ext = session:getVariable("vm_message_ext");
diff --git a/resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua b/resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua
index bc43ee2a38..58d96e0167 100644
--- a/resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua
+++ b/resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua
@@ -30,15 +30,23 @@
 			--skip the greeting
 		else
 			if (session:ready()) then
-				dtmf_digits = '';
-				if (string.len(greeting_id) > 0) then
-					--play the custom greeting
-					session:streamFile(voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav");
-					session:streamFile("silence_stream://200");
-				else
-					--play the default greeting
-					dtmf_digits = macro(session, "person_not_available_record_message", 1, 200);
-				end
+				--set the greeting based on the voicemail_greeting_number variable
+					if (voicemail_greeting_number ~= nil) then
+						if (string.len(voicemail_greeting_number) > 0) then
+							greeting_id = voicemail_greeting_number;
+						end
+					end
+
+				--play the greeting
+					dtmf_digits = '';
+					if (string.len(greeting_id) > 0) then
+						--custom greeting
+						session:streamFile(voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav");
+						session:streamFile("silence_stream://200");
+					else
+						--default greeting
+						dtmf_digits = macro(session, "person_not_available_record_message", 1, 200);
+					end
 			end
 		end
 	end
\ No newline at end of file
diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_message.lua b/resources/install/scripts/app/voicemail/resources/functions/record_message.lua
index cf0877554d..881988e630 100644
--- a/resources/install/scripts/app/voicemail/resources/functions/record_message.lua
+++ b/resources/install/scripts/app/voicemail/resources/functions/record_message.lua
@@ -27,8 +27,8 @@
 	function record_message()
 
 		--record your message at the tone press any key or stop talking to end the recording
-			if (skip_greeting == "true") then
-				--skip the greeting
+			if (skip_instructions == "true") then
+				--skip the instructions
 			else
 				if (string.len(dtmf_digits) == 0) then
 					dtmf_digits = macro(session, "record_message", 1, 100);