diff --git a/fet2020/authentications/views.py b/fet2020/authentications/views.py
index bbf8b0a3..2c9cc80e 100644
--- a/fet2020/authentications/views.py
+++ b/fet2020/authentications/views.py
@@ -25,7 +25,11 @@ def loginPage(request):
                 user = User.objects.create_user(auth_user.lower())
 
             login(request, user)
-            return redirect('home')
+
+            try:
+                return redirect(request.GET.get('next'))
+            except:
+                return redirect('home')
         else:
             messages.info(request, 'username or password is incorrect')
 
diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html
index c82f2b55..57f941b5 100644
--- a/fet2020/templates/layout.html
+++ b/fet2020/templates/layout.html
@@ -50,19 +50,19 @@ footer {
     <div class="top-bar-right">
         <ul class="dropdown vertical medium-horizontal menu" data-responsive-menu="drilldown medium-dropdown" data-animate-heigt="true">
             {% if request.user.is_authenticated %}
-                <li><a role="menuitem" style="color: black; background: lightgrey">Hallo {{request.user.username}}</a></li>
+                <li><a role="menuitem" style="color: black; background: lightgrey">Hallo {{ request.user.username }}</a></li>
                 <li><a href="/admin" style="background: lightgrey;">Admin</a></li>
-                <li><a href="{%url 'tasks'%}" style="background: lightgrey;">Tasks</a></li>
+                <li><a href="{% url 'tasks' %}" style="background: lightgrey;">Tasks</a></li>
             {% endif %}
             <li><a href="{% url 'posts.index' %}">Aktuelles</a></li>
             <!-- show active members first -->
-            <li><a href="{% url 'members'%}A">Fachschaft</a></li>
+            <li><a href="{% url 'members' %}A">Fachschaft</a></li>
             <li><a href="/fotos/">Fotos</a></li>
             <li><a href="/blackboard">Blackboard</a></li>
             {% if request.user.is_authenticated %}
-                <li><a href="{%url 'logout'%}">Logout</a></li>
+                <li><a href="{% url 'logout' %}">Logout</a></li>
             {% else %}
-                <li><a href="{%url 'login'%}">Login</a></li>
+                <li><a href="{% url 'login' %}?next={{ request.path }}">Login</a></li>
             {% endif %}
         </ul>
     </div>