diff --git a/Makefile b/Makefile
index cf9768dd5dcb8b369427fcd9369ddacf61d2ac0a..a683a3bc41cd6c5fd45dea8f7188fdd2db1ba8c2 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ 		--db-con="$(DB_CON)" \
 		--log-level=$(LOG_LEVEL) \
 		--scheduler-count=$(SCHEDULER_COUNT) \
 		--cache-path="$(CACHE_PATH)" \
-		--aes-key="$(AES_KEY)"
+		--aes-key=$(AES_KEY)
 
 sass:
 	@mkdir -p static
diff --git a/pkg/ext/middleware.go b/pkg/ext/middleware.go
index 2cf70cf0567b5348c7bc2cd459340d233c1db35d..061cf7cfb849699600e614d2aa7491b8736ef0b0 100644
--- a/pkg/ext/middleware.go
+++ b/pkg/ext/middleware.go
@@ -111,9 +111,10 @@ }
 
 func (i *InitialSetupMiddleware) Check(next http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+
 		// if user has been set to context it is logged in already
 		token := GetTokenFromCtx(r)
-		if token == nil {
+		if token != nil {
 			next(w, r)
 			return
 		}