diff --git a/startup/website.py b/startup/website.py
index 295e5bb0cab..4c2f5653b4f 100644
--- a/startup/website.py
+++ b/startup/website.py
@@ -1,4 +1,5 @@
 import webnotes, conf, os
+from webnotes.utils import cint, cstr
 
 def get_templates_path():
 	return os.path.join(os.path.dirname(conf.__file__), "app", "website", "templates")
@@ -61,15 +62,17 @@ def update_template_args(page_name, args):
 	
 	settings = webnotes.doc("Website Settings", "Website Settings")
 	for k in ["banner_html", "brand_html", "copyright", "address", "twitter_share_via",
-		"favicon", "facebook_share", "google_plus_one", "twitter_share", "linked_in_share"]:
+		"favicon", "facebook_share", "google_plus_one", "twitter_share", "linked_in_share",
+		"disable_signup"]:
 		if k in settings.fields:
 			args[k] = settings.fields.get(k)
 
-	for k in ["facebook_share", "google_plus_one", "twitter_share", "linked_in_share"]:
-		args[k] = int(args.get(k) or 0)
+	for k in ["facebook_share", "google_plus_one", "twitter_share", "linked_in_share",
+		"disable_signup"]:
+		args[k] = cint(args.get(k) or 0)
 	
-	args.url = quote(str(get_request_site_address(full_address=True)), str(""))
-	args.encoded_title = quote(str(args.title or ""), str(""))
+	args.url = quote(cstr(get_request_site_address(full_address=True)), cstr(""))
+	args.encoded_title = quote(cstr(args.title or ""), cstr(""))
 	
 	return args
 	
\ No newline at end of file
diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt
index 615c0a5b1b0..9c15480f07a 100644
--- a/website/doctype/website_settings/website_settings.txt
+++ b/website/doctype/website_settings/website_settings.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-03-26 06:51:18", 
+  "creation": "2013-04-30 12:58:46", 
   "docstatus": 0, 
-  "modified": "2013-04-17 11:51:30", 
+  "modified": "2013-05-02 15:51:14", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -219,13 +219,16 @@
   "reqd": 0
  }, 
  {
-  "description": "Enter domain names associated to this website, each on a new line", 
   "doctype": "DocField", 
-  "fieldname": "domain_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "Domain List", 
-  "reqd": 0
+  "fieldname": "column_break_28", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "description": "Disable Customer Signup link in Login page", 
+  "doctype": "DocField", 
+  "fieldname": "disable_signup", 
+  "fieldtype": "Check", 
+  "label": "Disable Signup"
  }, 
  {
   "create": 1,