Reset password was being sent to /login
Reorder conditionals in Reset Password view
Move flash messages inside the dialog box in Set Password page