diff --git a/snipts/templates/snipts/detail.html b/snipts/templates/snipts/detail.html
index bc3ec0d..e6bd107 100644
--- a/snipts/templates/snipts/detail.html
+++ b/snipts/templates/snipts/detail.html
@@ -2,7 +2,7 @@
 
 {% block page-title %}/ {% if snipt.title %}{{ snipt.title }}{% else %}Untitled{% endif %} / {{ user.username }} - {{ block.super }}{% endblock %}
 {% block html-class %}detail{% endblock %}
-{% block body-class %}{% if request.path == '/api/' %}api{% else %}detail{% endif %}{% endblock %}
+{% block body-class %}{% if request.path == '/api/' and request.user.is_authenticated %}api{% else %}detail{% endif %}{% endblock %}
 
 {% block js %}
         {{ block.super }}
@@ -15,7 +15,7 @@
 {% endblock %}
 
 {% block aside %}
-    {% if request.path == '/api/' %}
+    {% if request.path == '/api/' and request.user.is_authenticated %}
         <aside class="api-info">
             <div class="api-inner">
                 <h5>Your API credentials:</h5>
diff --git a/templates/base.html b/templates/base.html
index c81899b..aa5ee8d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -83,7 +83,7 @@
                             <a href="/public/" {% if '/public/' in request.path or public %} class="active"{% endif %}>Public snipts</a>
                         </li>
                         <li>
-                            <a href="/login/" {% if '/login/' in request.path %} class="active"{% endif %}>Log in</a>
+                            <a href="/login/?next={{ request.path }}" {% if '/login/' in request.path %} class="active"{% endif %}>Log in</a>
                         </li>
                         <li>
                             <a href="/signup/" {% if '/signup/' in request.path %} class="active"{% endif %}>Sign up</a>
@@ -96,7 +96,7 @@
                             <a href="/public/" {% if '/public/' in request.path or public %} class="active"{% endif %}>Public snipts</a>
                         </li>
                         <li>
-                            <a href="/logout/">Log out</a>
+                            <a href="/logout/?next={{ request.path }}">Log out</a>
                         </li>
                         <li><button class="btn btn-info btn-large" id="add-snipt">Add Snipt <i class="icon-search icon-plus icon-white"></i></button></li>
                     {% endif %}