diff --git a/backend/pb/handlers.go b/backend/pb/handlers.go
index cfdc659b..d96a1478 100644
--- a/backend/pb/handlers.go
+++ b/backend/pb/handlers.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/pocketbase/dbx"
diff --git a/backend/pb/pb.go b/backend/pb/pb.go
index a48bae11..10946b09 100644
--- a/backend/pb/pb.go
+++ b/backend/pb/pb.go
@@ -69,7 +69,6 @@ func StartPocketBase(distDirFS fs.FS) {
 	// event hooks
 	app.OnServe().BindFunc(func(se *core.ServeEvent) error {
 		se.Router.GET("/{path...}", apis.Static(distDirFS, true))
-
 		se.Router.GET("/api/upsnap/wake/{id}", HandlerWake).Bind(RequireUpSnapPermission())
 		se.Router.GET("/api/upsnap/wakegroup/{id}", HandlerWakeGroup).Bind(RequireUpSnapPermission())
 		se.Router.GET("/api/upsnap/sleep/{id}", HandlerSleep).Bind(RequireUpSnapPermission())
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 584aec19..53a84b19 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -66,7 +66,7 @@
 		}
 
 		// redirect to welcome page if setup is not completed
-		if ($settingsPub.setup_completed === false && page.url.pathname !== '/welcome') {
+		if ($settingsPub.setup_completed === false && page.url.pathname !== '/welcome/') {
 			$pocketbase.authStore.clear();
 			goto(resolve('/welcome'));
 			return;