diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index 3d38aca..04ecff1 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -20,6 +20,7 @@
 		"public/js/queries.js",
 		"public/js/sms_manager.js",
 		"public/js/utils/party.js",
+		"public/js/utils/demo.js",
 		"public/js/controllers/stock_controller.js",
 		"public/js/payment/payments.js",
 		"public/js/controllers/taxes_and_totals.js",
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index a913844..a067ec0 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -38,6 +38,7 @@
 			{ fieldname: 'fy_start_date', label: __('Financial Year Begins On'), fieldtype: 'Date', reqd: 1 },
 			// end date should be hidden (auto calculated)
 			{ fieldname: 'fy_end_date', label: __('End Date'), fieldtype: 'Date', reqd: 1, hidden: 1 },
+			{ fieldname: 'setup_demo', label: __('Generate dummy data for demo'), fieldtype: 'Check'},
 		],
 
 		onload: function (slide) {
diff --git a/erpnext/public/js/utils/demo.js b/erpnext/public/js/utils/demo.js
new file mode 100644
index 0000000..432bad6
--- /dev/null
+++ b/erpnext/public/js/utils/demo.js
@@ -0,0 +1,11 @@
+$(document).on("toolbar_setup", function() {
+	if (erpnext.is_demo_company_setup) {
+        console.log("setup");
+    }
+});
+
+erpnext.is_demo_company_setup = function() {
+    frappe.db.get_value("Global Default", "Global Default", "demo_company", function(r) {
+        console.log(r);
+    });
+};
\ No newline at end of file
diff --git a/erpnext/setup/demo.py b/erpnext/setup/demo.py
index 46500da..882ed37 100644
--- a/erpnext/setup/demo.py
+++ b/erpnext/setup/demo.py
@@ -28,7 +28,7 @@
 
 
 def create_demo_company():
-	company = erpnext.get_default_company()
+	company = frappe.db.get_all("Company")[0].name
 	company_doc = frappe.get_doc("Company", company)
 
 	# Make a dummy company
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 65b268e..ad49be6 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -5,6 +5,7 @@
 import frappe
 from frappe import _
 
+from ..demo import setup_demo_data
 from .operations import install_fixtures as fixtures
 
 
@@ -37,6 +38,11 @@
 				],
 			},
 			{
+				"status": _("Setting up demo data"),
+				"fail_msg": _("Failed to setup demo data"),
+				"tasks": [{"fn": setup_demo, "args": args, "fail_msg": _("Failed to login")}],
+			},
+			{
 				"status": _("Wrapping up"),
 				"fail_msg": _("Failed to login"),
 				"tasks": [{"fn": fin, "args": args, "fail_msg": _("Failed to login")}],
@@ -63,6 +69,11 @@
 	login_as_first_user(args)
 
 
+def setup_demo(args):
+	if args.get("setup_demo"):
+		setup_demo_data()
+
+
 def login_as_first_user(args):
 	if args.get("email") and hasattr(frappe.local, "login_manager"):
 		frappe.local.login_manager.login_as(args.get("email"))