diff --git a/erpnext/setup/doctype/setup_control/setup_control.py b/erpnext/setup/doctype/setup_control/setup_control.py
index 708b32a..6b8b37c 100644
--- a/erpnext/setup/doctype/setup_control/setup_control.py
+++ b/erpnext/setup/doctype/setup_control/setup_control.py
@@ -48,8 +48,8 @@
 		args = json.loads(args)
 
 		self.set_cp_defaults(args['company'], args['industry'], args['time_zone'], args['country'], args['account_name'])
-		self.create_profile(args['user'], args['first_name'], args['last_name'], args.get('pwd'))	
-	
+		self.create_profile(args['user'], args['first_name'], args['last_name'], args.get('pwd'))
+
 		# Domain related updates
 		try:
 			from server_tools.gateway_utils import add_domain_map
@@ -58,7 +58,9 @@
 			pass
 
 		# add record in domain_list of Website Settings
-		webnotes.conn.set_value('Website Settings', 'Website Settings', 'subdomain', args['url_name'] + ".erpnext.com")
+		account_url = args['url_name'] + '.erpnext.com'
+		webnotes.conn.set_value('Website Settings', 'Website Settings',
+				'subdomain', account_url)
 		
 	
 	# Account Setup
@@ -125,7 +127,8 @@
 		"""update activty feed and create todo for creation of item, customer, vendor"""
 		import home
 		home.make_feed('Comment', 'ToDo Item', '', webnotes.session['user'],
-			'<i>"' + 'Setup Complete. Please check your To Do List' + '"</i>', '#6B24B3')
+			'<i>"' + 'Setup Complete. Please check your <a href="#!todo">\
+			To Do List</a>' + '"</i>', '#6B24B3')
 
 		d = Document('ToDo Item')
 		d.description = 'Create your first Customer'
diff --git a/erpnext/utilities/page/users/users.py b/erpnext/utilities/page/users/users.py
index 44e2fb2..bf8cf45 100644
--- a/erpnext/utilities/page/users/users.py
+++ b/erpnext/utilities/page/users/users.py
@@ -154,7 +154,8 @@
 	args.update({
 		'company': webnotes.conn.get_default('company'),
 		'password': args.get('password'),
-		'account_url': webnotes.conn.get_default('account_url')
+		'account_url': webnotes.conn.get_value('Website Settings', 'Website
+			Settings', 'subdomain') or ""
 	})
 	if not args.get('last_name'): args['last_name'] = ''
 	sendmail_md(pr.email, subject="Welcome to ERPNext", msg=welcome_txt % args, from_defs=1)
@@ -189,4 +190,4 @@
 To login to your new ERPNext account, please go to:
 
 %(account_url)s
-"""
\ No newline at end of file
+"""