diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 22a691b5..8e3b0724 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -50,10 +50,15 @@
                 <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
                                             user= request.user['username']) }}">
                   {{ request.user['username'] }}</a>'s account 
-                <!-- the following link should only appear when verification is needed -->
-                <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                                            user= request.user['username']) }}" class="highlight">
-                  needs verification!</a>
+
+                {# the following link should only appear when verification is needed #}
+                {% if request.user.status == "needs_email_verification" %}
+                  <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
+                                              user=request.user['username']) }}"
+                     class="highlight">
+                    needs verification!</a>
+                {% endif %}
+
                 (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
               {% else %}
                  <a href="{{ request.urlgen('mediagoblin.auth.login') }}">