diff --git a/src/web.lisp b/src/web.lisp
index 541f200..ea9d97c 100644
--- a/src/web.lisp
+++ b/src/web.lisp
@@ -49,10 +49,11 @@
     (cond ((not (string= authenticity-token (auth:csrf-token)))
 	   `(,+forbidden+ (:content-type "text/plain") ("Denied")))
 	  ((uiop:file-exists-p (ritherdon-archive.config:database-name))
-	   (render #P"initial-setup.html" `(:token ,(auth:csrf-token))))
+	   `(,+service-unavailable+ (:location "/")))
+	   ;; (render #P"initial-setup.html" `(:token ,(auth:csrf-token))))
 	  (t (nera-db:init-db
 	      (lack.request:request-body-parameters ningle:*request*))
-	     (redirect "/dashboard")))))
+	     (redirect "/dashboard"))))) ; Redirect to /setup-complete?
 
 (defroute ("/login" :method :GET) ()
   (hermetic:auth (:logged-in)
@@ -78,7 +79,7 @@
 	   (progn
 	     (setf
 	      ;; Set session Id. to the logged in user.
-	      (gethash :id ningle:*session*) (auth:get-user-id username)
+	      (gethash :id ningle:*session*) (nera:get-user-id username)
 	      ;; Set the users password (for session)
 	      (gethash :password ningle:*session*) password)
 	    (redirect "/dashboard"))