diff --git a/frappe/model/utils/rename_field.py b/frappe/model/utils/rename_field.py
index 8f6c088c1a..0659f2097e 100644
--- a/frappe/model/utils/rename_field.py
+++ b/frappe/model/utils/rename_field.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import frappe
 import json
 from frappe.model import no_value_fields
+from frappe.utils.password import rename_password_field
 
 def rename_field(doctype, old_fieldname, new_fieldname):
 	"""This functions assumes that doctype is already synced"""
@@ -34,6 +35,10 @@ def rename_field(doctype, old_fieldname, new_fieldname):
 		update_reports(doctype, old_fieldname, new_fieldname)
 		update_users_report_view_settings(doctype, old_fieldname, new_fieldname)
 
+		if new_field.fieldtype == "Password":
+			rename_password_field(doctype, old_fieldname, new_fieldname)
+
+
 	# update in property setter
 	update_property_setters(doctype, old_fieldname, new_fieldname)
 
diff --git a/frappe/utils/password.py b/frappe/utils/password.py
index 1e49f4eef6..d151114f7e 100644
--- a/frappe/utils/password.py
+++ b/frappe/utils/password.py
@@ -70,6 +70,11 @@ def rename_password(doctype, old_name, new_name):
 		where doctype=%(doctype)s and name=%(old_name)s""",
 		{ 'doctype': doctype, 'new_name': new_name, 'old_name': old_name })
 
+def rename_password_field(doctype, old_fieldname, new_fieldname):
+	frappe.db.sql('''update `__Auth` set fieldname=%(new_fieldname)s
+		where doctype=%(doctype)s and fieldname=%(old_fieldname)s''',
+		{ 'doctype': doctype, 'old_fieldname': old_fieldname, 'new_fieldname': new_fieldname })
+
 def create_auth_table():
 	# same as Framework.sql
 	frappe.db.sql_ddl("""create table if not exists __Auth (