Server - Password reset improvements