Removed extra and unnecessary checks when changing the password