diff --git a/templates/login.html b/templates/login.html
index 66cb19a..033e323 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -15,8 +15,12 @@
   <div class="row">
     <div class="span8 offset2">
       <div class="hero-unit">
+        {% if request.user.is_authenticated %}
+          <p>Welcome back, {{ request.user.username }}</p>
+        {% else %}
         <a class="btn btn-large btn-primary" href="{% url login %}">Login with
           GitHub</a>
+        {% endif %}
       </div>
     </div>
   </div>
diff --git a/views.py b/views.py
index 724e256..a536f83 100644
--- a/views.py
+++ b/views.py
@@ -12,7 +12,7 @@ def index(request):
     # Set a test cookie. When the user clicks the 'Login' button, test and make
     # sure this cookie was set properly.
     request.session.set_test_cookie()
-    return render_to_response('login.html')
+    return render_to_response('login.html', RequestContext(request))
 
 
 def login(request):