diff --git a/modules/debug/test_beef_debug/command.js b/modules/debug/test_beef_debug/command.js
index 20460d2fb..a311e9a8c 100644
--- a/modules/debug/test_beef_debug/command.js
+++ b/modules/debug/test_beef_debug/command.js
@@ -7,7 +7,7 @@
 beef.execute(function() {
 
 	try {
-		var msg = "<%= @msg.gsub(/"/, '\\"') %>";
+		var msg = decodeURIComponent(beef.encode.base64.decode('<%= Base64.encode64(@msg).delete("\n") %>'));
 		beef.debug(msg);
 		beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result=called the beef.debug() function. Check the developer console for your debug message.');
 	} catch(e) {
diff --git a/modules/misc/blockui/command.js b/modules/misc/blockui/command.js
index 6822d8c6c..1f8d0b874 100644
--- a/modules/misc/blockui/command.js
+++ b/modules/misc/blockui/command.js
@@ -8,7 +8,7 @@ beef.execute(function() {
   var timeout = '<%= @timeout %>' * 1000;
 
   var blockui = function() {
-    $j.blockUI({ message: '<%= @message.gsub(/'/, "\\\'") %>' });
+    $j.blockUI({ message: decodeURIComponent(beef.encode.base64.decode('<%= Base64.encode64(@message).delete("\n") %>')) });
     setTimeout("$j.unblockUI();", <%= @timeout %> * 1000);
   }
 
diff --git a/modules/misc/bozocrack/command.js b/modules/misc/bozocrack/command.js
index 73fd5f6a1..2158146c1 100644
--- a/modules/misc/bozocrack/command.js
+++ b/modules/misc/bozocrack/command.js
@@ -6,7 +6,7 @@
 
 beef.execute(function() {
 
-	var hash   = '<%= @hash.gsub(/'/, "\\'") %>';
+	var hash   = beef.encode.base64.decode('<%= Base64.encode64(@hash).delete("\n") %>');
 	var result = '';
 
         // validate hash
diff --git a/modules/misc/google_search/command.js b/modules/misc/google_search/command.js
index f1f899596..21053c73c 100644
--- a/modules/misc/google_search/command.js
+++ b/modules/misc/google_search/command.js
@@ -6,7 +6,7 @@
 
 beef.execute(function() {
 
-	var query = '<%= @query.gsub(/'/, "\\'") %>';
+	var query = beef.encode.base64.decode('<%= Base64.encode64(@query).delete("\n") %>');
 
 	var searchGoogle = function(query) {