diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index dc4c540b..d8c441ef 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -196,14 +196,6 @@ def resend_activation(request):
     Resend the activation email.
     """
 
-    if request.user["email_verified"]:
-        messages.add_message(
-            request,
-            messages.ERROR,
-            _("You've already verified your email address!"))
-        
-        return redirect(request, "mediagoblin.user_pages.user_home", user=request.user['username'])
-
     if request.user is None:
         messages.add_message(
             request,
@@ -212,6 +204,14 @@ def resend_activation(request):
         
         return redirect(request, "/auth/login")
 
+    if request.user["email_verified"]:
+        messages.add_message(
+            request,
+            messages.ERROR,
+            _("You've already verified your email address!"))
+        
+        return redirect(request, "mediagoblin.user_pages.user_home", user=request.user['username'])
+
     request.user[u'verification_key'] = unicode(uuid.uuid4())
     request.user.save()