diff --git a/db.go b/db.go
index e3bc5523..da966fcc 100644
--- a/db.go
+++ b/db.go
@@ -41,6 +41,13 @@ func (h *Headscale) initDB() error {
 		db.Exec(`create extension if not exists "uuid-ossp";`)
 	}
 
+	_ = db.Migrator().RenameTable("namespaces", "users")
+
+	err = db.AutoMigrate(&User{})
+	if err != nil {
+		return err
+	}
+
 	_ = db.Migrator().RenameColumn(&Machine{}, "ip_address", "ip_addresses")
 	_ = db.Migrator().RenameColumn(&Machine{}, "name", "hostname")
 
@@ -187,13 +194,6 @@ func (h *Headscale) initDB() error {
 		return err
 	}
 
-	_ = db.Migrator().RenameTable("Namespace", "User")
-
-	err = db.AutoMigrate(&User{})
-	if err != nil {
-		return err
-	}
-
 	err = db.AutoMigrate(&PreAuthKey{})
 	if err != nil {
 		return err