diff --git a/models/setup.go b/models/setup.go
index a3db6c2..d6914e0 100644
--- a/models/setup.go
+++ b/models/setup.go
@@ -238,7 +238,8 @@ func CreateTables() {
 		);
 		INSERT INTO users SELECT * FROM _users_old;
 		COMMIT;
-		PRAGMA foreign_keys=on;		
+		PRAGMA foreign_keys=on;
+		DROP TABLE _users_old;
 		`)
 		if err != nil {
 			log.Printf("Error altering users table to drop RoleId column : '%s'\n", err)
@@ -256,6 +257,17 @@ func CreateTables() {
 		}
 	}
 
+	// Add SafeId column to secrets table
+	safeIdCheck, _ := CheckColumnExists("secrets", "SafeId")
+	if !safeIdCheck {
+		// Add the column for LdapGroup in the roles table
+		_, err := db.Exec("ALTER TABLE secrets ADD COLUMN SafeId INTEGER REFERENCES safes(SafeId);")
+		if err != nil {
+			log.Printf("Error altering secrets table to add SafeId column : '%s'\n", err)
+			os.Exit(1)
+		}
+	}
+
 	/*
 		// Database updates added after initial version released
 		ldapCheck, _ := CheckColumnExists("roles", "LdapGroup")