Really fix Activation on forgot_password

Close #1223