diff --git a/cgi-bin/webnotes/auth.py b/cgi-bin/webnotes/auth.py
index d15309020b..a3f04a1a1b 100644
--- a/cgi-bin/webnotes/auth.py
+++ b/cgi-bin/webnotes/auth.py
@@ -104,7 +104,7 @@ class HTTPRequest:
 			else:
 				db_name = getattr(webnotes.defs,'default_db_name','')
 	
-		webnotes.conn = webnotes.db.Database(user = db_name,password = getattr(webnotes.defs,'db_password',''))
+		webnotes.conn = webnotes.db.Database(user = db_name,password = getattr(webnotes.defs,'db_password', ''))
 		webnotes.ac_name = ac_name
 
 # =================================================================================
diff --git a/cgi-bin/webnotes/db.py b/cgi-bin/webnotes/db.py
index 8d175e317e..45837a2051 100644
--- a/cgi-bin/webnotes/db.py
+++ b/cgi-bin/webnotes/db.py
@@ -26,7 +26,7 @@ class Database:
 		self.transaction_writes = 0
 		self.testing_tables = []
 
-		self.password = self.get_db_password(ac_name, password)
+		self.password = self.get_db_password(user, password)
 		
 		self.connect()
 		if self.user != 'root':
@@ -57,7 +57,9 @@ class Database:
 			return ''
 			
 	def get_db_login(self, ac_name):
-		return getattr(defs,'db_name_map').get(ac_name, getattr(defs,'default_db_name'))
+		if hasattr(defs, 'db_name_map'):
+			return getattr(defs,'db_name_map').get(ac_name, getattr(defs,'default_db_name'))
+		else: return ac_name
 
 	def connect(self):
 		"""
diff --git a/cgi-bin/webnotes/widgets/page.py b/cgi-bin/webnotes/widgets/page.py
index 0cad0b72d6..de31fb9fd7 100644
--- a/cgi-bin/webnotes/widgets/page.py
+++ b/cgi-bin/webnotes/widgets/page.py
@@ -19,7 +19,7 @@ class Page:
 			Loads page info from files in module
 		"""
 		# load js
-		doc.fields['__script'] = module.get_doc_file('page',doc.name,'.js').read()
+		doc.fields['__script'] = module.get_doc_file('page',doc.name,'.js').read() or doc.script
 		doc.script = None
 
 		# load css