diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 0baad4f6422..2a02ad5b573 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -947,7 +947,13 @@
             		keyboard : keyboard
             	});
             }            
-            
+
+            if (g_hostid != null) {
+                $.extend(deployVmData, {
+                    hostid : g_hostid
+                });
+            }
+ 
             $(window).trigger('cloudStack.deployVirtualMachine', {
                 deployVmData: deployVmData,
                 formData: args.data
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 3d5f9b8f87c..26748048f20 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -325,9 +325,12 @@
                 }
 
                 if ("hosts" in args.context) {
+                    g_hostid = args.context.hosts[0].id;
                     $.extend(data, {
                         hostid: args.context.hosts[0].id
                     });
+                } else {
+                    g_hostid = null;
                 }
 
                 if ("affinityGroups" in args.context) {
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 1adab5b47d2..2ab4ca90ba3 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -21,6 +21,7 @@ var g_username = null;
 var g_userid = null;
 var g_account = null;
 var g_domainid = null;
+var g_hostid = null;
 var g_loginCmdText = null;
 var g_enableLogging = false;
 var g_timezoneoffset = null;