diff --git a/src/Infrastructure.EntityFramework/Auth/Models/OpaqueKeyExchangeCredential.cs b/src/Infrastructure.EntityFramework/Auth/Models/OpaqueKeyExchangeCredential.cs
new file mode 100644
index 0000000000..b66da088be
--- /dev/null
+++ b/src/Infrastructure.EntityFramework/Auth/Models/OpaqueKeyExchangeCredential.cs
@@ -0,0 +1,17 @@
+using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Models;
+
+namespace Bit.Infrastructure.EntityFramework.Auth.Models;
+
+public class OpaqueKeyExchangeCredential : Core.Auth.Entities.OpaqueKeyExchangeCredential
+{
+    public virtual User User { get; set; }
+}
+
+public class OpaqueKeyExchangeCredentialMapperProfile : Profile
+{
+    public OpaqueKeyExchangeCredentialMapperProfile()
+    {
+        CreateMap<Core.Auth.Entities.OpaqueKeyExchangeCredential, OpaqueKeyExchangeCredential>().ReverseMap();
+    }
+}
diff --git a/src/Infrastructure.EntityFramework/Auth/Repositories/OpaqueKeyExchangeCredentialRepository.cs b/src/Infrastructure.EntityFramework/Auth/Repositories/OpaqueKeyExchangeCredentialRepository.cs
index 994654e8a8..cfc34951ac 100644
--- a/src/Infrastructure.EntityFramework/Auth/Repositories/OpaqueKeyExchangeCredentialRepository.cs
+++ b/src/Infrastructure.EntityFramework/Auth/Repositories/OpaqueKeyExchangeCredentialRepository.cs
@@ -1,27 +1,28 @@
 using AutoMapper;
-using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.KeyManagement.UserKey;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories;
 
-public class OpaqueKeyExchangeCredentialRepository : Repository<OpaqueKeyExchangeCredential, OpaqueKeyExchangeCredential, Guid>, IOpaqueKeyExchangeCredentialRepository
+public class OpaqueKeyExchangeCredentialRepository
+    : Repository<Core.Auth.Entities.OpaqueKeyExchangeCredential, OpaqueKeyExchangeCredential, Guid>,
+      IOpaqueKeyExchangeCredentialRepository
 {
-    public OpaqueKeyExchangeCredentialRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper) : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.OpaqueKeyExchangeCredentials)
+    public OpaqueKeyExchangeCredentialRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
+        : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.OpaqueKeyExchangeCredentials)
     {
     }
 
-    public async Task<OpaqueKeyExchangeCredential> GetByUserIdAsync(Guid userId)
+    public async Task<Core.Auth.Entities.OpaqueKeyExchangeCredential> GetByUserIdAsync(Guid userId)
     {
-        using (var scope = ServiceScopeFactory.CreateScope())
-        {
-            var dbContext = GetDatabaseContext(scope);
-            var opaqueConfig = await GetDbSet(dbContext).SingleOrDefaultAsync(sc => sc.UserId == userId);
-            return Mapper.Map<OpaqueKeyExchangeCredential>(opaqueConfig);
-        }
+        using var scope = ServiceScopeFactory.CreateScope();
+        var dbContext = GetDatabaseContext(scope);
+        var opaqueConfig = await GetDbSet(dbContext).SingleOrDefaultAsync(sc => sc.UserId == userId);
+        return Mapper.Map<Core.Auth.Entities.OpaqueKeyExchangeCredential>(opaqueConfig);
     }
     public UpdateEncryptedDataForKeyRotation UpdateKeysForRotationAsync(Guid userId, IEnumerable<OpaqueKeyExchangeRotateKeyData> credentials)
     {
diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
index 61e69a7f19..e728cc4094 100644
--- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
@@ -51,7 +51,7 @@ public class DatabaseContext : DbContext
     public DbSet<Group> Groups { get; set; }
     public DbSet<GroupUser> GroupUsers { get; set; }
     public DbSet<Installation> Installations { get; set; }
-    public DbSet<Core.Auth.Entities.OpaqueKeyExchangeCredential> OpaqueKeyExchangeCredentials { get; set; }
+    public DbSet<OpaqueKeyExchangeCredential> OpaqueKeyExchangeCredentials { get; set; }
     public DbSet<Organization> Organizations { get; set; }
     public DbSet<OrganizationApiKey> OrganizationApiKeys { get; set; }
     public DbSet<OrganizationSponsorship> OrganizationSponsorships { get; set; }
@@ -107,7 +107,7 @@ public class DatabaseContext : DbContext
         var eSsoConfig = builder.Entity<SsoConfig>();
         var eTaxRate = builder.Entity<TaxRate>();
         var eUser = builder.Entity<User>();
-        var eOpaqueCredential = builder.Entity<Core.Auth.Entities.OpaqueKeyExchangeCredential>();
+        var eOpaqueCredential = builder.Entity<OpaqueKeyExchangeCredential>();
         var eOrganizationApiKey = builder.Entity<OrganizationApiKey>();
         var eOrganizationConnection = builder.Entity<OrganizationConnection>();
         var eOrganizationDomain = builder.Entity<OrganizationDomain>();