diff --git a/src/Umbraco.Core/Security/IBackofficeSecurity.cs b/src/Umbraco.Core/Security/IBackofficeSecurity.cs
index 3b3c956cd6..12b29a0288 100644
--- a/src/Umbraco.Core/Security/IBackofficeSecurity.cs
+++ b/src/Umbraco.Core/Security/IBackofficeSecurity.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Cms.Core.Security
         /// <returns>The current user's Id that has been authenticated for the request.</returns>
         /// <remarks>If authentication hasn't taken place this will be unsuccessful.</remarks>
         // TODO: This should just be an extension method on ClaimsIdentity
-        Attempt<int?> GetUserId();
+        Attempt<int> GetUserId();
 
         /// <summary>
         /// Checks if the specified user as access to the app
diff --git a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
index fcf76f4e9c..f15adfd28b 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
@@ -130,7 +130,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
         [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)] // Needed to enforce the principle set on the request, if one exists.
         public IDictionary<string, object> GetPasswordConfig(int userId)
         {
-            Attempt<int?> currentUserId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId() ?? Attempt<int?>.Fail();
+            Attempt<int> currentUserId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId() ?? Attempt<int>.Fail();
             return _passwordConfiguration.GetConfiguration(
                 currentUserId.Success
                     ? currentUserId.Result != userId
diff --git a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
index 0084c0680d..5c75534a8b 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
@@ -311,7 +311,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
         [ValidateAngularAntiForgeryToken]
         public async Task<Dictionary<string, string>> GetCurrentUserLinkedLogins()
         {
-            var identityUser = await _backOfficeUserManager.FindByIdAsync(_backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().ResultOr(0)?.ToString(CultureInfo.InvariantCulture));
+            var identityUser = await _backOfficeUserManager.FindByIdAsync(_backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().ResultOr(0).ToString(CultureInfo.InvariantCulture));
 
             // deduplicate in case there are duplicates (there shouldn't be now since we have a unique constraint on the external logins
             // but there didn't used to be)
diff --git a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
index 22a0a47fc5..734f1d6062 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
@@ -742,8 +742,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
         [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
         public IActionResult PostDisableUsers([FromQuery]int[] userIds)
         {
-            var tryGetCurrentUserId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId() ?? Attempt<int?>.Fail();
-            if (tryGetCurrentUserId.Success && userIds.Contains(tryGetCurrentUserId.Result!.Value))
+            var tryGetCurrentUserId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId() ?? Attempt<int>.Fail();
+            if (tryGetCurrentUserId.Success && userIds.Contains(tryGetCurrentUserId.Result))
             {
                 return ValidationProblem("The current user cannot disable itself");
             }
diff --git a/src/Umbraco.Web.Common/Security/BackofficeSecurity.cs b/src/Umbraco.Web.Common/Security/BackofficeSecurity.cs
index e1fa57557b..f772ad583c 100644
--- a/src/Umbraco.Web.Common/Security/BackofficeSecurity.cs
+++ b/src/Umbraco.Web.Common/Security/BackofficeSecurity.cs
@@ -36,10 +36,10 @@ public class BackOfficeSecurity : IBackOfficeSecurity
                     // Check again
                     if (_currentUser == null)
                     {
-                        Attempt<int?> id = GetUserId();
-                        if (id.Success && id.Result is not null)
+                        Attempt<int> id = GetUserId();
+                        if (id.Success)
                         {
-                            _currentUser = id.Success ? _userService.GetUserById(id.Result.Value) : null;
+                            _currentUser = id.Success ? _userService.GetUserById(id.Result) : null;
                         }
                     }
                 }
@@ -50,10 +50,12 @@ public class BackOfficeSecurity : IBackOfficeSecurity
     }
 
     /// <inheritdoc />
-    public Attempt<int?> GetUserId()
+    public Attempt<int> GetUserId()
     {
         ClaimsIdentity? identity = _httpContextAccessor.HttpContext?.GetCurrentIdentity();
-        return identity == null ? Attempt.Fail<int?>() : Attempt.Succeed(identity.GetId());
+
+        var id = identity?.GetId();
+        return id.HasValue is false ? Attempt.Fail<int>() : Attempt.Succeed(id.Value);
     }
 
     /// <inheritdoc />
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs
index f8a07fdf21..00362a0abe 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs
@@ -60,7 +60,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings
         public void CanConvertIntToNullableInt()
         {
             int i = 1;
-            Attempt<int?> result = i.TryConvertTo<int?>();
+            Attempt<int> result = i.TryConvertTo<int>();
             Assert.That(result.Success, Is.True);
         }