Fixing bugs with reset password part 1