diff --git a/resources/install/scripts/app.lua b/resources/install/scripts/app.lua
index f7e5aa5a15..39dd56308d 100644
--- a/resources/install/scripts/app.lua
+++ b/resources/install/scripts/app.lua
@@ -23,6 +23,7 @@
 --	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 --	POSSIBILITY OF SUCH DAMAGE.
 
+
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
 	dofile(scripts_dir.."/resources/functions/config.lua");
@@ -40,9 +41,11 @@
 	for key,value in pairs(argv) do
 		if (key > 1) then
 			arguments = arguments .. " '" .. value .. "'";
+			--freeswitch.consoleLog("notice", "[app.lua] argv["..key.."]: "..argv[key].."\n");
 		end
 	end
 
 --route the request to the application
-	--freeswitch.consoleLog("notice", "[app] lua route: ".. scripts_dir .. "/app/" .. app_name .. "/index.lua\n");
-	dofile(scripts_dir .. "/app/" .. app_name .. "/index.lua");
\ No newline at end of file
+	--freeswitch.consoleLog("notice", "["..app_name.."]".. scripts_dir .. "/app/" .. app_name .. "/index.lua\n");
+	loadfile(scripts_dir .. "/app/" .. app_name .. "/index.lua")(argv);
+
diff --git a/resources/install/scripts/app/voicemail/index.lua b/resources/install/scripts/app/voicemail/index.lua
index 550379e02e..c987edbfa3 100644
--- a/resources/install/scripts/app/voicemail/index.lua
+++ b/resources/install/scripts/app/voicemail/index.lua
@@ -41,9 +41,9 @@
 	debug["sql"] = false;
 
 --get the argv values
-	script_name = argv[0];
-	voicemail_action = argv[1];
-
+	script_name = argv[1];
+	voicemail_action = argv[2];
+	
 --starting values
 	dtmf_digits = '';
 	timeouts = 0;
@@ -193,7 +193,7 @@
 --send a message waiting event
 	if (voicemail_action == "mwi") then
 		--get the mailbox info
-			account = argv[2];
+			account = argv[3];
 			array = explode("@", account);
 			voicemail_id = array[1];
 			domain_name = array[2];