diff --git a/public/js/complete_setup.js b/public/js/complete_setup.js
index f0b21c8..37c2fba 100644
--- a/public/js/complete_setup.js
+++ b/public/js/complete_setup.js
@@ -75,12 +75,17 @@
 			if(!data) return;
 			$(this).set_working();
 			$c_obj('Setup Control','setup_account',data,function(r, rt){
-				sys_defaults = r.message;
-				user_fullname = r.message.user_fullname;
-				wn.boot.user_info[user].fullname = user_fullname;
-				d.hide();
-				$('header').toggle(true);
-				wn.container.wntoolbar.set_user_name();
+				if(!r.exc) {
+					sys_defaults = r.message;
+					user_fullname = r.message.user_fullname;
+					wn.boot.user_info[user].fullname = user_fullname;
+					d.hide();
+					$('header').toggle(true);
+					wn.container.wntoolbar.set_user_name();
+					
+					setTimeout(function() { window.location.reload(); }, 3000);
+				}
+				
 			});
 		};
 		
diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py
index 5bfe4a7..bf8b87f 100644
--- a/setup/doctype/setup_control/setup_control.py
+++ b/setup/doctype/setup_control/setup_control.py
@@ -97,7 +97,7 @@
 		self.create_email_digest()
 
 		webnotes.clear_cache()
-		msgprint("Company setup is complete. Please refresh the page before continuing.")
+		msgprint("Company setup is complete. This page will be refreshed in a moment.")
 		
 		import webnotes.utils
 		user_fullname = (args.get('first_name') or '') + (args.get('last_name')