diff --git a/app/auth/views.py b/app/auth/views.py
index 0804685..8e537aa 100644
--- a/app/auth/views.py
+++ b/app/auth/views.py
@@ -13,6 +13,7 @@ def before_request():
     if current_user.is_authenticated:
         current_user.ping()
         if not current_user.confirmed \
+                and request.endpoint \
                 and request.blueprint != 'auth' \
                 and request.endpoint != 'static':
             return redirect(url_for('auth.unconfirmed'))
diff --git a/app/main/__init__.py b/app/main/__init__.py
index 1fe11f5..6ab3701 100644
--- a/app/main/__init__.py
+++ b/app/main/__init__.py
@@ -8,6 +8,6 @@ from . import views, errors
 from ..models import Permission
 
 
-@main.context_processor
+@main.app_context_processor
 def inject_permissions():
     return dict(Permission=Permission)
diff --git a/app/templates/base.html b/app/templates/base.html
index 0d5aec9..33b168e 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -30,7 +30,7 @@
                 {% endif %}
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                {% if current_user.is_authenticated and current_user.can(Permission.MODERATE) %}
+                {% if current_user.can(Permission.MODERATE) %}
                 <li><a href="{{ url_for('main.moderate') }}">Moderate Comments</a></li>
                 {% endif %}
                 {% if current_user.is_authenticated %}