diff --git a/models/setup.go b/models/setup.go
index ff2c3dc..e4c33ee 100644
--- a/models/setup.go
+++ b/models/setup.go
@@ -203,12 +203,6 @@ func CreateTables() {
 		}
 	}
 
-	// Set any unassigned secrets to the default safe id
-	if _, err = db.Exec("UPDATE secrets SET SafeId = 1 WHERE SafeId is null;"); err != nil {
-		log.Printf("Error setting safe ID of existing secrets : '%s'", err)
-		os.Exit(1)
-	}
-
 	// Secrets table
 	if _, err = db.Exec(createSecrets); err != nil {
 		log.Printf("Error checking secrets table : '%s'", err)
@@ -374,6 +368,12 @@ func CreateTables() {
 		}
 	}
 
+	// Set any unassigned secrets to the default safe id
+	if _, err = db.Exec("UPDATE secrets SET SafeId = 1 WHERE SafeId is null;"); err != nil {
+		log.Printf("Error setting safe ID of existing secrets : '%s'", err)
+		os.Exit(1)
+	}
+
 	/*
 		// Database updates added after initial version released
 		ldapCheck, _ := CheckColumnExists("roles", "LdapGroup")