diff --git a/pagemodels/pagedata.go b/pagemodels/pagedata.go
index 0dd8a45..d711efc 100644
--- a/pagemodels/pagedata.go
+++ b/pagemodels/pagedata.go
@@ -34,5 +34,6 @@ const (
 	F_INDEX_TEXTE_ABS2 = "Abs2"
 	F_INDEX_GO_BUTTON  = "GoButton"
 
-	P_LOGIN_NAME = "login"
+	P_LOGIN_NAME  = "login"
+	P_LOGOUT_NAME = "logout"
 )
diff --git a/pages/login.go b/pages/login.go
index 22cbe4b..842eaee 100644
--- a/pages/login.go
+++ b/pages/login.go
@@ -138,6 +138,10 @@ func (p *LoginPage) POST(engine *templating.Engine, app core.App) HandleFunc {
 			})
 		}
 
-		return e.Redirect(303, "/reihen")
+		redirect := "/reihen"
+		if r := e.Request.URL.Query().Get("redirectTo"); r != "" {
+			redirect = r
+		}
+		return e.Redirect(303, redirect)
 	}
 }
diff --git a/pages/logout.go b/pages/logout.go
new file mode 100644
index 0000000..052aa5a
--- /dev/null
+++ b/pages/logout.go
@@ -0,0 +1,52 @@
+package pages
+
+import (
+	"net/http"
+
+	"github.com/Theodor-Springmann-Stiftung/musenalm/app"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/templating"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/tools/router"
+)
+
+func init() {
+	lp := &LogoutPage{
+		StaticPage: pagemodels.StaticPage{
+			Name:     pagemodels.P_LOGOUT_NAME,
+			Layout:   "blank",
+			Template: "/logout/",
+			URL:      "/logout/",
+		},
+	}
+	app.Register(lp)
+}
+
+type LogoutPage struct {
+	pagemodels.StaticPage
+}
+
+func (p *LogoutPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
+	router.GET(p.URL, p.GET())
+	return nil
+}
+
+func (p *LogoutPage) GET() HandleFunc {
+	return func(e *core.RequestEvent) error {
+		// TODO: the function to delete tokens is not yet there
+		// as of right now, the tokens get only deleted from the clients
+		// We need to delete the tokens from the cache + table.
+		e.SetCookie(&http.Cookie{
+			Name:   dbmodels.SESSION_COOKIE_NAME,
+			Path:   "/",
+			MaxAge: -1,
+		})
+		e.Response.Header().Set("Clear-Site-Data", "\"cookies\"")
+		redirect := "/reihen"
+		if r := e.Request.URL.Query().Get("redirectTo"); r != "" {
+			redirect = r
+		}
+		return e.Redirect(303, redirect)
+	}
+}
diff --git a/templating/engine.go b/templating/engine.go
index 4e2beca..a7ba112 100644
--- a/templating/engine.go
+++ b/templating/engine.go
@@ -342,6 +342,7 @@ func (e *Engine) Response200(request *core.RequestEvent, path string, ld map[str
 func requestData(request *core.RequestEvent) map[string]any {
 	data := make(map[string]any)
 	data["Path"] = request.Request.URL.Path
+	data["FullPath"] = GetRequestPathWithQuery(request.Request)
 	data["Query"] = request.Request.URL.Query()
 	data["Method"] = request.Request.Method
 	data["Host"] = request.Request.Host
@@ -362,3 +363,11 @@ func requestData(request *core.RequestEvent) map[string]any {
 
 	return data
 }
+
+func GetRequestPathWithQuery(r *http.Request) string {
+	path := r.URL.EscapedPath()
+	if r.URL.RawQuery != "" {
+		return path + "?" + r.URL.RawQuery
+	}
+	return path
+}
diff --git a/views/layouts/components/_footer.gohtml b/views/layouts/components/_footer.gohtml
index c0e145e..d854277 100644
--- a/views/layouts/components/_footer.gohtml
+++ b/views/layouts/components/_footer.gohtml
@@ -24,10 +24,10 @@
 				{{ .page.User.Email }}
 				|
 				<i class="ri-logout-box-line"></i>
-				<a href="/login">Logout</a>
+				<a href="/logout?redirectTo={{ .page.FullPath }}">Logout</a>
 			{{ else }}
 				<i class="ri-login-box-line"></i>
-				<a href="/login">Login</a>
+				<a href="/login?redirectTo={{ .page.FullPath }}">Login</a>
 			{{ end }}
 		</div>
 	</div>
diff --git a/views/routes/login/body.gohtml b/views/routes/login/body.gohtml
index 063fdef..330046b 100644
--- a/views/routes/login/body.gohtml
+++ b/views/routes/login/body.gohtml
@@ -12,7 +12,7 @@
 			</div>
 		</div>
 		<h1 class="text-4xl self-baseline text-center w-full mt-6">Musenalm | Login</h1>
-		<form class="mt-9 w-full grid grid-cols-3 gap-4" method="POST" action="/login/">
+		<form class="mt-9 w-full grid grid-cols-3 gap-4" method="POST">
 			<div
 				class="col-span-3 border-2 border-transparent focus-within:border-slate-600 px-2 py-1 pb-1.5
 				bg-slate-200 focus-within:bg-slate-50 rounded-md transition-all duration-100">