diff --git a/konova/contexts.py b/konova/contexts.py
index f601161a..27f829fd 100644
--- a/konova/contexts.py
+++ b/konova/contexts.py
@@ -26,7 +26,6 @@ class BaseContext:
     def __init__(self, request: HttpRequest, additional_context: dict = {}):
         self.context["language"] = request.LANGUAGE_CODE
         self.context["user"] = request.user
-        self.__handle_current_role(request)
 
         # Add additional context, derived from given parameters
         self.context.update(additional_context)
diff --git a/konova/templates/kspneo/choiceColumnForm.html b/konova/templates/konova/choiceColumnForm.html
similarity index 100%
rename from konova/templates/kspneo/choiceColumnForm.html
rename to konova/templates/konova/choiceColumnForm.html
diff --git a/konova/templates/kspneo/form.html b/konova/templates/konova/form.html
similarity index 100%
rename from konova/templates/kspneo/form.html
rename to konova/templates/konova/form.html
diff --git a/konova/templates/kspneo/home.html b/konova/templates/konova/home.html
similarity index 100%
rename from konova/templates/kspneo/home.html
rename to konova/templates/konova/home.html
diff --git a/konova/views.py b/konova/views.py
index 3a7fb45f..09030525 100644
--- a/konova/views.py
+++ b/konova/views.py
@@ -6,6 +6,7 @@ Created on: 16.11.20
 
 """
 from django.contrib.auth import logout
+from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest
 from django.shortcuts import redirect, render
 
@@ -27,6 +28,7 @@ def logout_view(request: HttpRequest):
     return redirect(SSO_SERVER_BASE)
 
 
+@login_required
 def home_view(request: HttpRequest):
     """
     Renders the landing page