diff --git a/RIGS/templates/RIGS/index.html b/RIGS/templates/RIGS/index.html
index 6266854e..9d82fa70 100644
--- a/RIGS/templates/RIGS/index.html
+++ b/RIGS/templates/RIGS/index.html
@@ -7,9 +7,9 @@
     </div>
     <div class="col-sm-6">
         <div class="well">
-            {% if request.user %}
-                <h3>Welcome back {{ request.user.get_full_name }}.<br />
-                <small>Your rigboard initials are {{ request.user.initials }}</small></h3>
+            {% if user.is_authenticated %}
+                <h3>Welcome back {{ user.get_full_name }}.<br />
+                <small>Your rigboard initials are {{ user.initials }}</small></h3>
             {% endif %}
             <h3>There are currently {{ rig_count }} rigs coming up.</h3>
             <a class="btn btn-default" href="{% url 'rigboard' %}">View Rigboard</a>
diff --git a/templates/base.html b/templates/base.html
index cca1fc2a..ddc0d5ca 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -81,7 +81,7 @@
                             </li>
                         </ul>
                     {% else %}
-                        <a href="{% url "login" %}?next={{ request.build_absolute_uri }}">
+                        <a href="{% url "login" %}?next={{ request.path }}">
                             <span class="icon-user"></span>
                             Hi guest
                         </a>