diff --git a/asteroid.lisp b/asteroid.lisp
index fb38c0d..a492c42 100644
--- a/asteroid.lisp
+++ b/asteroid.lisp
@@ -1028,7 +1028,8 @@
             ":template"
             (radiance:environment-directory (radiance-core:environment) :template)
             ":static"
-            (radiance:environment-directory (radiance-core:environment) :static)))
+            (radiance:environment-directory (radiance-core:environment) :static))
+  (db:connect :main))
 
 (defun start-slynk-server-in-new-thread (&optional (port 4009))
   "Starts a Slynk server in a new thread on the specified port."
@@ -1054,7 +1055,7 @@
   (ensure-radiance-environment)
   
   ;; Initialize user management before server starts
-  (initialize-user-system)
+  ;; (initialize-user-system)
   
   ;; TODO: Add auto-scan on startup once database timing issues are resolved
   ;; For now, use the "Scan Library" button in the admin interface
diff --git a/database.lisp b/database.lisp
index bbeb568..9d08b7a 100644
--- a/database.lisp
+++ b/database.lisp
@@ -23,8 +23,8 @@
                              (user-id :integer)
                              (track-ids :text))))
   
-  (unless (db:collection-exists-p "USERS")
-    (db:create "USERS" '((username :text)
+  (unless (db:collection-exists-p "users")
+    (db:create "users" '((username :text)
                          (email :text)
                          (password-hash :text)
                          (role :text)