diff --git a/management/server/sqlite_store.go b/management/server/sqlite_store.go
index 15761080a..109f4cbdc 100644
--- a/management/server/sqlite_store.go
+++ b/management/server/sqlite_store.go
@@ -163,8 +163,7 @@ func (s *SqliteStore) SaveAccount(account *Account) error {
 	// operate over a fresh copy as we will modify its fields
 	accCopy := account.Copy()
 	accCopy.SetupKeysG = make([]SetupKey, 0, len(accCopy.SetupKeys))
-	for id, key := range accCopy.SetupKeys {
-		key.Id = id
+	for _, key := range accCopy.SetupKeys {
 		//we need an explicit reference to the account as it is missing for some reason
 		key.AccountID = accCopy.Id
 		accCopy.SetupKeysG = append(accCopy.SetupKeysG, *key)
diff --git a/management/server/sqlite_store_test.go b/management/server/sqlite_store_test.go
index 668e40665..88ab54913 100644
--- a/management/server/sqlite_store_test.go
+++ b/management/server/sqlite_store_test.go
@@ -109,7 +109,7 @@ func TestSqlite_SaveAccount_Large(t *testing.T) {
 		account.NameServerGroups[nameserver.ID] = nameserver
 
 		setupKey := GenerateDefaultSetupKey()
-		account.SetupKeys[setupKey.Id] = setupKey
+		account.SetupKeys[setupKey.Key] = setupKey
 	}
 
 	err = store.SaveAccount(account)