diff --git a/src/Umbraco.Core/Security/BackOfficeUserValidator.cs b/src/Umbraco.Core/Security/BackOfficeUserValidator.cs
index b73a637463..58319e95a7 100644
--- a/src/Umbraco.Core/Security/BackOfficeUserValidator.cs
+++ b/src/Umbraco.Core/Security/BackOfficeUserValidator.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Security
         public override async Task<IdentityResult> ValidateAsync(T item)
         {
             //Don't validate if the user's email or username hasn't changed otherwise it's just wasting SQL queries.
-            if (((ICanBeDirty)item).IsDirty())
+            if (item.IsPropertyDirty("Email") || item.IsPropertyDirty("UserName"))
             {
                 return await base.ValidateAsync(item);
             }