diff --git a/py/core/doctype/profile/profile.py b/py/core/doctype/profile/profile.py
index 425c713437..f2146406f7 100644
--- a/py/core/doctype/profile/profile.py
+++ b/py/core/doctype/profile/profile.py
@@ -56,5 +56,6 @@ class DocType:
 		from webnotes.utils.email_lib import sendmail_md
 		sendmail_md(recipients= self.doc.email or self.doc.name, \
 			msg = reset_password_mail % {"user": self.get_fullname(), "password":pwd}, \
-			subject = 'Password Reset')
-			
\ No newline at end of file
+			subject = 'Password Reset', from_defs=1)
+		
+		return pwd
diff --git a/py/webnotes/handler.py b/py/webnotes/handler.py
index 9709cdc7e9..a85946db2e 100755
--- a/py/webnotes/handler.py
+++ b/py/webnotes/handler.py
@@ -174,7 +174,12 @@ def reset_password():
 	
 	user = form_dict.get('user', '')
 	if webnotes.conn.sql("""select name from tabProfile where name=%s""", user):
-		get_obj('Profile', user).reset_password()
+		pwd = get_obj('Profile', user).reset_password()
+		try:
+			from server_tools.gateway_utils import change_password
+			change_password(new_password=pwd, user=user)
+		except ImportError, e:
+			pass
 		webnotes.msgprint("Password has been reset and sent to your email id.")
 	else:
 		webnotes.msgprint("No such user (%s)", user)