diff --git a/gracedb/templates/navbar_frag.html b/gracedb/templates/navbar_frag.html
index 02d75df445f23401b11904216739bb9f51d9b366..2671b848e616723421f9598f59a2e9c49849fcd6 100644
--- a/gracedb/templates/navbar_frag.html
+++ b/gracedb/templates/navbar_frag.html
@@ -8,9 +8,9 @@
         <li id="nav-feeds"><a href="{% url "feeds" %}">RSS</a></li> 
     {% endif %}
     <li id="nav-latest"><a href="{% url "latest" %}">Latest</a></li>
-    {# if user_is_internal #}
+    {% if user.is_authenticated %}
     <li id="nav-userprofile"><a href="{% url "userprofile-home" %}">Options</a></li>
-    {# endif #}
+    {% endif %}
     <li id="nav-docs"><a href="{% url "home" %}documentation/">Documentation</a></li>
     {% if user %}
         {% if user.is_staff %}
diff --git a/gracedb/userprofile/views.py b/gracedb/userprofile/views.py
index 74d5b03cf29868859d4e639731bb380d1e449c4c..02cf2d82602e131ea9a7b6d1ea287f6ab2473aa7 100644
--- a/gracedb/userprofile/views.py
+++ b/gracedb/userprofile/views.py
@@ -1,4 +1,5 @@
 
+from django.contrib.auth.decorators import login_required
 from django.http import (HttpResponse, HttpResponseRedirect, 
     HttpResponseNotFound, Http404, HttpResponseForbidden,
     HttpResponseBadRequest)
@@ -31,6 +32,7 @@ from search.query.labels import labelQuery
 
 # Let's let everybody onto the index view.
 #@internal_user_required
+@login_required
 def index(request):
     triggers = Trigger.objects.filter(user=request.user)
     contacts = Contact.objects.filter(user=request.user)