Reset password feature + (De)Activate scenario refactor