diff --git a/apps/trust/src/pages/auth/VerifyMagicLinkPage.tsx b/apps/trust/src/pages/auth/VerifyMagicLinkPage.tsx
index f093f69e8..846c5485d 100644
--- a/apps/trust/src/pages/auth/VerifyMagicLinkPage.tsx
+++ b/apps/trust/src/pages/auth/VerifyMagicLinkPage.tsx
@@ -63,7 +63,8 @@ export default function VerifyMagicLinkPagePageMutation() {
           description: __("Your have successfully signed in"),
           variant: "success",
         });
-        window.location.href = getPathPrefix();
+        const pathPrefix = getPathPrefix();
+        window.location.href = pathPrefix ? getPathPrefix() : "/";
       },
       onError: (err) => {
         toast({
diff --git a/pkg/server/api/authn/cookie.go b/pkg/server/api/authn/cookie.go
index 464646edd..bf4b4ff19 100644
--- a/pkg/server/api/authn/cookie.go
+++ b/pkg/server/api/authn/cookie.go
@@ -27,7 +27,7 @@ type Cookie struct {
 }
 
 func (c *Cookie) Set(w http.ResponseWriter, session *coredata.Session) {
-	securecookie.Set(
+	_ = securecookie.Set(
 		w,
 		c.sessionCookieConfig(time.Until(session.ExpiredAt)),
 		session.ID.String(),
@@ -46,7 +46,6 @@ func (c *Cookie) sessionCookieConfig(maxAge time.Duration) securecookie.Config {
 		HTTPOnly: c.config.HTTPOnly,
 		SameSite: c.config.SameSite,
 		Path:     c.config.Path,
-		Domain:   c.config.Domain,
 		MaxAge:   int(maxAge.Seconds()),
 	}
 }
diff --git a/pkg/server/api/compliancepage/context.go b/pkg/server/api/compliancepage/context.go
index 6d06588dc..58736896a 100644
--- a/pkg/server/api/compliancepage/context.go
+++ b/pkg/server/api/compliancepage/context.go
@@ -28,8 +28,8 @@ var (
 )
 
 func CompliancePageFromContext(ctx context.Context) *coredata.TrustCenter {
-	trustCenter, _ := ctx.Value(compliancePageKey).(*coredata.TrustCenter)
-	return trustCenter
+	page, _ := ctx.Value(compliancePageKey).(*coredata.TrustCenter)
+	return page
 }
 
 func ComplianceMembershipFromContext(ctx context.Context) *coredata.TrustCenterAccess {
diff --git a/pkg/server/api/trust/v1/v1_resolver.go b/pkg/server/api/trust/v1/v1_resolver.go
index 47e7e270a..0e40b99e6 100644
--- a/pkg/server/api/trust/v1/v1_resolver.go
+++ b/pkg/server/api/trust/v1/v1_resolver.go
@@ -178,8 +178,7 @@ func (r *mutationResolver) SendMagicLink(ctx context.Context, input types.SendMa
 		Email: input.Email,
 	}
 
-	if false {
-		// if customDomain != nil {
+	if customDomain != nil {
 		baseURL, err := baseurl.Parse(fmt.Sprintf("https://%s", customDomain.Domain))
 		if err != nil {
 			r.logger.ErrorCtx(ctx, "cannot parse custom domain url", log.Error(err))
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 1432e8993..83ca23111 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -172,6 +172,7 @@ func (s *Server) TrustCenterHandler() http.Handler {
 	r := chi.NewRouter()
 
 	r.Use(compliancepage.NewSNIMiddleware(s.trustService))
+	r.Use(s.stripTrustPrefix)
 	r.Use(func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.Header().Set("Strict-Transport-Security", "max-age=31536000; preload")