3 files changed, 8 insertions, 4 deletions
diff --git a/core/views/auth.py b/core/views/auth.py
index 966a100..db17ae3 100644
--- a/core/views/auth.py
+++ b/core/views/auth.py
@@ -57,7 +57,7 @@ def expologin(request):
         else:
             # going to login page when you are already logged in
             from django.contrib.admin.templatetags import log
-            return render(request, "tasks.html", {})
+            return render(request, "login/tasks.html", {})
 
     # POST
     username = request.POST["username"]
diff --git a/core/views/other.py b/core/views/other.py
index f1a7bdf..4019e73 100644
--- a/core/views/other.py
+++ b/core/views/other.py
@@ -104,12 +104,12 @@ def frontpage(request):
     """never seen in common practice. Logon should redirect here when this is more useful"""
 
     if request.user.is_authenticated:
-        return render(request, "tasks.html")
+        return render(request, "login/tasks.html")
 
     expeditions = Expedition.objects.order_by("-year")
     logbookentry = LogbookEntry
     cave = Cave
-    return render(request, "frontpage.html", locals())
+    return render(request, "login/frontpage.html", locals())
 
 
 @login_required_if_public
diff --git a/core/views/signup.py b/core/views/signup.py
index 177b2b7..c0360f9 100644
--- a/core/views/signup.py
+++ b/core/views/signup.py
@@ -3,6 +3,7 @@ import re
 from pathlib import Path
 
 import django.forms as forms
+from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect, render
 from django.urls import reverse
@@ -19,13 +20,16 @@ from troggle.core.utils import (
 )
 from troggle.core.views.editor_helpers import HTMLarea
 
-from .auth import login_required_if_public
 
 """The new user signup form and expo user management system in 2025.
 """
 
 @ensure_csrf_cookie
+@login_required
 def signup(request):
+    if request.user.username in ["expo", "expoadmin"]:
+        return redirect("/accounts/newregister/")
+        # /accounts/login/?next=/signup
     if request.method == "POST":  # If the form has been submitted...
         pageform = ExpoSignupForm(request.POST)  # A form bound to the POST data
         if pageform.is_valid():