diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index bb3d272..c139f8a 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -163,6 +163,21 @@
 				erpnext.wiz.org.set_fy_dates(slide);
 			},
 
+			validate: function() {
+				// validate fiscal year start and end dates
+				if (this.values.fy_start_date=='Invalid date' || this.values.fy_end_date=='Invalid date') {
+					msgprint(__("Please enter valid Financial Year Start and End Dates"));
+					return false;
+				}
+
+				if ((this.values.company_name || "").toLowerCase() == "company") {
+					msgprint(__("Company Name cannot be Company"));
+					return false;
+				}
+
+				return true;
+			},
+
 			css_class: "single-column",
 
 			set_fy_dates: function(slide) {