diff --git a/frontend/components/theme-switch.tsx b/frontend/components/theme-switch.tsx
index cea8c2d4..11bb1e9f 100644
--- a/frontend/components/theme-switch.tsx
+++ b/frontend/components/theme-switch.tsx
@@ -21,6 +21,7 @@ export default function ThemeSwitch({className}: { className?: string }) {
   return (
     <Button
       onClick={() => setTheme(resolvedTheme === "dark" ? "light" : "dark")}
+      variant={"ghost"}
       className={cn('flex items-center aspect-square m-0', className)}
       data-cy={'theme-toggle'}
     >
diff --git a/frontend/middleware.ts b/frontend/middleware.ts
index a06f35a3..85eb5a7e 100644
--- a/frontend/middleware.ts
+++ b/frontend/middleware.ts
@@ -12,10 +12,8 @@ export async function middleware(request: NextRequest) {
     const sid = request.cookies.get('sid')?.value;
     if(!sid) return false;
 
-
     try {
-      const apiUrl = new URL("/api", request.nextUrl.origin)
-      apiUrl.port = '8080'
+      const apiUrl = 'http://localhost:8080/api'
       const client = new GraphQLClient(apiUrl.toString())
       const loggedInData = await client.request<LoginCheckQuery>(LoginCheckDocument, { sid })
       return loggedInData.loginCheck !== null
@@ -55,3 +53,4 @@ export const config = {
     '/app-settings'
   ],
 }
+
diff --git a/server/graph/schema.resolvers.go b/server/graph/schema.resolvers.go
index 41312704..21b3a232 100644
--- a/server/graph/schema.resolvers.go
+++ b/server/graph/schema.resolvers.go
@@ -1268,6 +1268,7 @@ func (r *queryResolver) Login(ctx context.Context, mail string, password string)
 		Name:     "sid",
 		Value:    newSid,
 		Path:     "/",
+		Domain:   os.Getenv("PUBLIC_DOMAIN"),
 		HttpOnly: true,
 		Secure:   os.Getenv("ENV") != "DEV",
 		SameSite: http.SameSiteLaxMode,
@@ -1299,17 +1300,25 @@ func (r *queryResolver) Login(ctx context.Context, mail string, password string)
 
 // LoginCheck is the resolver for the loginCheck field.
 func (r *queryResolver) LoginCheck(ctx context.Context, sid *string) (*model.User, error) {
+	if sid == nil {
+		log.Printf("No sid provided in login check")
+		return nil, nil
+	}
+
 	if _, err := uuid.Parse(*sid); err != nil {
+		log.Printf("Failed to parse sid to uuid in login check: %v", err)
 		return nil, nil
 	}
 
 	var sessions []*model.Session
 
 	if err := r.DB.NewSelect().Model(&sessions).Where("id = ?", sid).Scan(ctx); err != nil {
+		log.Printf("error while selection sessions from db in login check: %v", err)
 		return nil, ErrInternal
 	}
 
 	if sessions == nil {
+		log.Printf("Found no session for user with id: %v", *sid)
 		return nil, nil
 	}
 
@@ -1318,6 +1327,7 @@ func (r *queryResolver) LoginCheck(ctx context.Context, sid *string) (*model.Use
 	if err := r.DB.NewSelect().Model(&users).
 		Where("id = ?", sessions[0].UserID).
 		Scan(ctx); err != nil {
+		log.Printf("error while selection user from db after having found the session: %v", err)
 		return nil, ErrInternal
 	}