Fixed change password corner cases