Fix Activation hack for password recovery

Close #1223