LPS-37924 1.) Redirect to the email update page if that option is chosen...

..., not the password reset page 2.)  Redirect to the correct page if following the email link