Added some improvements to change password feature