9 Commits (reset_pwd_state_not_active)