diff --git a/py/webnotes/db.py b/py/webnotes/db.py
index f288714d47..211a6202c3 100644
--- a/py/webnotes/db.py
+++ b/py/webnotes/db.py
@@ -26,7 +26,7 @@ class Database:
 		self.transaction_writes = 0
 		self.testing_tables = []
 
-		self.password = self.get_db_password(user, password)
+		self.password = self.get_db_password(self.user, password)
 		
 		self.connect()
 		if self.user != 'root':
diff --git a/py/webnotes/modules/patch_handler.py b/py/webnotes/modules/patch_handler.py
index 988bf9eeef..af26ba25ec 100644
--- a/py/webnotes/modules/patch_handler.py
+++ b/py/webnotes/modules/patch_handler.py
@@ -18,8 +18,9 @@ def run(patch_list, overwrite = 0, log_exception=1, conn = '', db_name = '', db_
 
 	# db connection
 	if not conn:
-		connect_db(db_name or webnotes.defs.default_db_name, \
-			db_password or webnotes.defs.db_password)
+		dbn = db_name or webnotes.defs.default_db_name
+		pwd = db_password or (hasattr(webnotes.defs, 'get_db_password') and webnotes.defs.get_db_password(dbn)) or (hasattr(webnotes.defs, 'db_password') and webnotes.defs.db_password) 
+		connect_db(dbn, pwd)
 	else:
 		webnotes.conn = conn