diff --git a/src/Api/Controllers/DevicesController.cs b/src/Api/Controllers/DevicesController.cs
index cc4ae0f12..1e94236a3 100644
--- a/src/Api/Controllers/DevicesController.cs
+++ b/src/Api/Controllers/DevicesController.cs
@@ -17,7 +17,6 @@ public class DevicesController : Controller
     private readonly IDeviceService _deviceService;
     private readonly IUserService _userService;
     private readonly IUserRepository _userRepository;
-
     public DevicesController(
         IDeviceRepository deviceRepository,
         IDeviceService deviceService,
@@ -101,6 +100,7 @@ public class DevicesController : Controller
         }
 
         await _deviceService.SaveAsync(model.ToDevice(device));
+
     }
 
     [AllowAnonymous]
diff --git a/src/Core/Services/IDeviceService.cs b/src/Core/Services/IDeviceService.cs
index 3109cc107..2cb441ba1 100644
--- a/src/Core/Services/IDeviceService.cs
+++ b/src/Core/Services/IDeviceService.cs
@@ -7,4 +7,5 @@ public interface IDeviceService
     Task SaveAsync(Device device);
     Task ClearTokenAsync(Device device);
     Task DeleteAsync(Device device);
+
 }
diff --git a/src/Core/Services/Implementations/DeviceService.cs b/src/Core/Services/Implementations/DeviceService.cs
index 99f4648a3..16d0937a7 100644
--- a/src/Core/Services/Implementations/DeviceService.cs
+++ b/src/Core/Services/Implementations/DeviceService.cs
@@ -41,6 +41,7 @@ public class DeviceService : IDeviceService
     public async Task DeleteAsync(Device device)
     {
         await _deviceRepository.DeleteAsync(device);
+
         await _pushRegistrationService.DeleteRegistrationAsync(device.Id.ToString());
     }
 }
diff --git a/src/Identity/IdentityServer/BaseRequestValidator.cs b/src/Identity/IdentityServer/BaseRequestValidator.cs
index c7d88e9e9..cc7cab59a 100644
--- a/src/Identity/IdentityServer/BaseRequestValidator.cs
+++ b/src/Identity/IdentityServer/BaseRequestValidator.cs
@@ -37,7 +37,6 @@ public abstract class BaseRequestValidator<T> where T : class
     private readonly IPolicyRepository _policyRepository;
     private readonly IUserRepository _userRepository;
     private readonly ICaptchaValidationService _captchaValidationService;
-
     public BaseRequestValidator(
         UserManager<User> userManager,
         IDeviceRepository deviceRepository,
@@ -545,19 +544,16 @@ public abstract class BaseRequestValidator<T> where T : class
 
     private async Task<Device> SaveDeviceAsync(User user, ValidatedTokenRequest request)
     {
-        var device = GetDeviceFromRequest(request);
-        if (device != null)
+        var deviceFromRequest = GetDeviceFromRequest(request);
+        if (deviceFromRequest != null)
         {
             var existingDevice = await GetKnownDeviceAsync(user, request);
             if (existingDevice == null)
             {
-                device.UserId = user.Id;
-                await _deviceService.SaveAsync(device);
-
                 var now = DateTime.UtcNow;
                 if (now - user.CreationDate > TimeSpan.FromMinutes(10))
                 {
-                    var deviceType = device.Type.GetType().GetMember(device.Type.ToString())
+                    var deviceType = deviceFromRequest.Type.GetType().GetMember(deviceFromRequest.Type.ToString())
                         .FirstOrDefault()?.GetCustomAttribute<DisplayAttribute>()?.GetName();
                     if (!_globalSettings.DisableEmailNewDevice)
                     {
@@ -565,14 +561,13 @@ public abstract class BaseRequestValidator<T> where T : class
                             _currentContext.IpAddress);
                     }
                 }
-
-                return device;
             }
 
-            return existingDevice;
+            deviceFromRequest.UserId = user.Id;
+            await _deviceService.SaveAsync(deviceFromRequest);
         }
 
-        return null;
+        return deviceFromRequest;
     }
 
     private async Task ResetFailedAuthDetailsAsync(User user)
diff --git a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
index 45a1454ae..45ad410ee 100644
--- a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
+++ b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
@@ -86,6 +86,14 @@ public abstract class WebApplicationFactoryBase<T> : WebApplicationFactory<T>
             services.Remove(eventRepositoryService);
             services.AddSingleton<IEventRepository, EventRepository>();
 
+            var mailDeliveryService = services.First(sd => sd.ServiceType == typeof(IMailDeliveryService));
+            services.Remove(mailDeliveryService);
+            services.AddSingleton<IMailDeliveryService, NoopMailDeliveryService>();
+
+            var captchaValidationService = services.First(sd => sd.ServiceType == typeof(ICaptchaValidationService));
+            services.Remove(captchaValidationService);
+            services.AddSingleton<ICaptchaValidationService, NoopCaptchaValidationService>();
+
             // Our Rate limiter works so well that it begins to fail tests unless we carve out
             // one whitelisted ip. We should still test the rate limiter though and they should change the Ip
             // to something that is NOT whitelisted