diff --git a/handler/auth.go b/handler/auth.go
index a5c9cd0..e027e1c 100644
--- a/handler/auth.go
+++ b/handler/auth.go
@@ -86,16 +86,7 @@ func (handler AuthImpl) handleSignIn() http.HandlerFunc {
 				return nil, err
 			}
 
-			cookie := http.Cookie{
-				Name:     "id",
-				Value:    session.Id,
-				MaxAge:   60 * 60 * 8, // 8 hours
-				Secure:   true,
-				HttpOnly: true,
-				SameSite: http.SameSiteStrictMode,
-				Path:     "/",
-			}
-
+			cookie := middleware.CreateSessionCookie(session.Id)
 			http.SetCookie(w, &cookie)
 
 			return session.User, nil
diff --git a/handler/middleware/cross_site_request_forgery.go b/handler/middleware/cross_site_request_forgery.go
index eae2bc1..c8ed1a4 100644
--- a/handler/middleware/cross_site_request_forgery.go
+++ b/handler/middleware/cross_site_request_forgery.go
@@ -30,6 +30,7 @@ func (rr *csrfResponseWriter) Write(data []byte) (int, error) {
 		if err == nil {
 			csrfField := fmt.Sprintf(`<input type="hidden" name="csrf-token" value="%s">`, csrfToken)
 			dataStr = strings.ReplaceAll(dataStr, "</form>", csrfField+"</form>")
+			dataStr = strings.ReplaceAll(dataStr, "CSRF_TOKEN", csrfToken)
 		}
 	}
 
@@ -52,30 +53,21 @@ func CrossSiteRequestForgery(auth service.Auth) func(http.Handler) http.Handler
 				r.Method == http.MethodPatch {
 
 				csrfToken := r.FormValue("csrf-token")
+				if csrfToken == "" {
+					csrfToken = r.Header.Get("csrf-token")
+				}
 				if csrfToken == "" || !auth.IsCsrfTokenValid(csrfToken, session.Id) {
 					http.Error(w, "", http.StatusForbidden)
 					return
 				}
 			}
 
-			if session == nil {
-				var err error
-				session, err = auth.SignInAnonymous()
-				if err != nil {
-					http.Error(w, "", http.StatusInternalServerError)
-					return
-				}
+			if session == nil && (strings.Contains(r.RequestURI, "/auth/signup") || strings.Contains(r.RequestURI, "/auth/signin")) {
+				session, _ = auth.SignInAnonymous()
+
+				cookie := CreateSessionCookie(session.Id)
+				http.SetCookie(w, &cookie)
 			}
-			cookie := http.Cookie{
-				Name:     "id",
-				Value:    session.Id,
-				MaxAge:   60 * 60 * 8, // 8 hours
-				Secure:   true,
-				HttpOnly: true,
-				SameSite: http.SameSiteStrictMode,
-				Path:     "/",
-			}
-			http.SetCookie(w, &cookie)
 
 			responseWriter := newCsrfResponseWriter(w, auth, session)
 			next.ServeHTTP(responseWriter, r)
diff --git a/handler/middleware/default.go b/handler/middleware/default.go
new file mode 100644
index 0000000..0146fb5
--- /dev/null
+++ b/handler/middleware/default.go
@@ -0,0 +1,15 @@
+package middleware
+
+import "net/http"
+
+func CreateSessionCookie(sessionId string) http.Cookie {
+	return http.Cookie{
+		Name:     "id",
+		Value:    sessionId,
+		MaxAge:   60 * 60 * 8, // 8 hours
+		Secure:   true,
+		HttpOnly: true,
+		SameSite: http.SameSiteStrictMode,
+		Path:     "/",
+	}
+}
diff --git a/template/workout/workout.templ b/template/workout/workout.templ
index c605663..a9bb397 100644
--- a/template/workout/workout.templ
+++ b/template/workout/workout.templ
@@ -1,73 +1,72 @@
 package workout
 
 templ WorkoutComp(currentDate string) {
-	<main class="mx-2">
-		<form
-			class="max-w-xl mx-auto flex flex-col gap-4 justify-center mt-10"
-			hx-post="/api/workout"
-			hx-target="#workout-placeholder"
-			hx-swap="outerHTML"
-		>
-			<h2 class="text-4xl mb-8">Track your workout</h2>
-			<input id="date" type="date" class="input input-bordered" value={ currentDate } name="date"/>
-			<select class="select select-bordered w-full" name="type">
-				<option>Push Ups</option>
-				<option>Pull Ups</option>
-			</select>
-			<input type="number" class="input input-bordered" placeholder="Sets" name="sets"/>
-			<input type="number" class="input input-bordered" placeholder="Reps" name="reps"/>
-			<button class="btn btn-primary self-end">Save</button>
-		</form>
-		<div hx-get="/api/workout" hx-trigger="load"></div>
-	</main>
+<main class="mx-2">
+	<form class="max-w-xl mx-auto flex flex-col gap-4 justify-center mt-10" hx-post="/api/workout"
+		hx-target="#workout-placeholder" hx-swap="outerHTML">
+		<h2 class="text-4xl mb-8">Track your workout</h2>
+		<input id="date" type="date" class="input input-bordered" value={ currentDate } name="date" />
+		<select class="select select-bordered w-full" name="type">
+			<option>Push Ups</option>
+			<option>Pull Ups</option>
+		</select>
+		<input type="number" class="input input-bordered" placeholder="Sets" name="sets" />
+		<input type="number" class="input input-bordered" placeholder="Reps" name="reps" />
+		<button class="btn btn-primary self-end">Save</button>
+	</form>
+	<div hx-get="/api/workout" hx-trigger="load"></div>
+</main>
 }
 
 type Workout struct {
-	Id   string
-	Date string
-	Type string
-	Sets string
-	Reps string
+Id string
+Date string
+Type string
+Sets string
+Reps string
 }
 
 templ WorkoutListComp(workouts []Workout) {
-	<div class="overflow-x-auto mx-auto max-w-screen-lg">
-		<h2 class="text-4xl mt-14 mb-8">Workout history</h2>
-		<table class="table table-auto max-w-full">
-			<thead>
-				<tr>
-					<th>Date</th>
-					<th>Type</th>
-					<th>Sets</th>
-					<th>Reps</th>
-					<th></th>
-				</tr>
-			</thead>
+<div class="overflow-x-auto mx-auto max-w-screen-lg">
+	<h2 class="text-4xl mt-14 mb-8">Workout history</h2>
+	<table class="table table-auto max-w-full">
+		<thead>
+			<tr>
+				<th>Date</th>
+				<th>Type</th>
+				<th>Sets</th>
+				<th>Reps</th>
+				<th></th>
+			</tr>
+		</thead>
+		<form>
 			<tbody>
 				<tr class="hidden" id="workout-placeholder"></tr>
 				for _,w := range workouts {
-					@WorkoutItemComp(w, false)
+				@WorkoutItemComp(w, false)
 				}
 			</tbody>
-		</table>
-	</div>
+		</form>
+	</table>
+</div>
 }
 
 templ WorkoutItemComp(w Workout, includePlaceholder bool) {
-	if includePlaceholder {
-		<tr class="hidden" id="workout-placeholder"></tr>
-	}
-	<tr>
-		<th>{ w.Date }</th>
-		<th>{ w.Type }</th>
-		<th>{ w.Sets }</th>
-		<th>{ w.Reps }</th>
-		<th>
-			<div class="tooltip" data-tip="Delete Entry">
-				<button hx-delete={ "api/workout/" + w.Id } hx-target="closest tr">
-					Delete
-				</button>
-			</div>
-		</th>
-	</tr>
+if includePlaceholder {
+<tr class="hidden" id="workout-placeholder"></tr>
+}
+<tr>
+	<th>{ w.Date }</th>
+	<th>{ w.Type }</th>
+	<th>{ w.Sets }</th>
+	<th>{ w.Reps }</th>
+	<th>
+		<div class="tooltip" data-tip="Delete Entry">
+			<button hx-headers='{"csrf-token": "CSRF_TOKEN"}' hx-delete={ "api/workout/" + w.Id } hx-target="closest tr"
+				type="submit">
+				Delete
+			</button>
+		</div>
+	</th>
+</tr>
 }