diff --git a/src/FiscalOS.API/Accounts/Add/Endpoint.cs b/src/FiscalOS.API/Accounts/Add/Endpoint.cs
index 8aa1cb6..d376897 100644
--- a/src/FiscalOS.API/Accounts/Add/Endpoint.cs
+++ b/src/FiscalOS.API/Accounts/Add/Endpoint.cs
@@ -1,3 +1,5 @@
+using Account = FiscalOS.Core.Accounts.Account;
+
 namespace FiscalOS.API.Accounts.Add;
 
 internal static class Endpoint
@@ -59,8 +61,9 @@ internal static class Endpoint
 
     var decryptedAccessToken = await encryptor.DecryptAsyncFor(user, plaidInstitutionMetadata.EncryptedAccessToken, ct);
     var accountMetadata = PlaidAccountMetadata.From(request.PlaidAccountId, request.PlaidAccountName);
-    var account = Account.From(user.Institutions.First().Id, request.PlaidAccountName, accountMetadata);
+    var account = Account.From(request.PlaidAccountName, accountMetadata);
     user.AddAccount(account);
+    user.Institutions.First().AddAccount(account);
 
     await appDbContext.SaveChangesAsync(ct);
     await queue.EnqueueAsync(new(plaidInstitutionMetadata.ItemId), ct);
diff --git a/src/FiscalOS.API/Institutions/Connect/Endpoint.cs b/src/FiscalOS.API/Institutions/Connect/Endpoint.cs
index 55c20b9..925dbf3 100644
--- a/src/FiscalOS.API/Institutions/Connect/Endpoint.cs
+++ b/src/FiscalOS.API/Institutions/Connect/Endpoint.cs
@@ -1,3 +1,5 @@
+using Institution = FiscalOS.Core.Accounts.Institution;
+
 namespace FiscalOS.API.Institutions.Connect;
 
 internal static class Endpoint
diff --git a/src/FiscalOS.API/Institutions/Get/Response.cs b/src/FiscalOS.API/Institutions/Get/Response.cs
index 934bcec..e0aa56d 100644
--- a/src/FiscalOS.API/Institutions/Get/Response.cs
+++ b/src/FiscalOS.API/Institutions/Get/Response.cs
@@ -1,3 +1,6 @@
+using Account = FiscalOS.Core.Accounts.Account;
+using Institution = FiscalOS.Core.Accounts.Institution;
+
 namespace FiscalOS.API.Institutions.Get;
 
 internal sealed record Response
diff --git a/tests/FiscalOS.API.Tests/Integration/Accounts/AddTests.cs b/tests/FiscalOS.API.Tests/Integration/Accounts/AddTests.cs
index 5b20954..2c91552 100644
--- a/tests/FiscalOS.API.Tests/Integration/Accounts/AddTests.cs
+++ b/tests/FiscalOS.API.Tests/Integration/Accounts/AddTests.cs
@@ -169,8 +169,6 @@ public class AddTests(TestApi testApi) : IntegrationTest(testApi)
       var userEncryptionKey = await encryptor.GenerateEncryptedKeyAsync(ct);
       var user = User.From("User1", passwordHasher.Hash("@Password1"), userEncryptionKey);
 
-      await context.AddAsync(user, ct);
-
       var encryptedAccessToken = await encryptor.EncryptAsyncFor(user, "accessToken", ct);
       var plaidMetadata = PlaidInstitutionMetadata.From(
         "alreadyExists",
@@ -183,11 +181,13 @@ public class AddTests(TestApi testApi) : IntegrationTest(testApi)
       await context.AddAsync(institution, ct);
 
       var plaidAccountMetadata = PlaidAccountMetadata.From("accountId", "Some Account");
-      var account = Account.From(institution.Id, "Some Account", plaidAccountMetadata);
+      var account = Account.From("Some Account", plaidAccountMetadata);
 
+      institution.AddAccount(account);
       user.AddInstitution(institution);
       user.AddAccount(account);
 
+      await context.AddAsync(user, ct);
       await context.SaveChangesAsync(ct);
       return (user, institution, account);
     }, TestContext.Current.CancellationToken);