Change Login Validator for one including restore