Index: src/applications/auth/controller/PhabricatorEmailVerificationController.php
===================================================================
--- src/applications/auth/controller/PhabricatorEmailVerificationController.php
+++ src/applications/auth/controller/PhabricatorEmailVerificationController.php
@@ -44,7 +44,7 @@
         'user. Make sure you followed the link in the email correctly and are '.
         'logged in with the user account associated with the email address.');
       $continue = pht('Rats!');
-    } else if ($email->getIsVerified()) {
+    } else if ($email->getIsVerified() && $user->getIsEmailVerified()) {
       $title = pht('Address Already Verified');
       $content = pht(
         'This email address has already been verified.');
Index: src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
===================================================================
--- src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
+++ src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
@@ -19,7 +19,7 @@
 
     $email = $user->loadPrimaryEmail();
 
-    if ($email->getIsVerified()) {
+    if ($user->getIsEmailVerified()) {
       return id(new AphrontRedirectResponse())->setURI('/');
     }