diff --git a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
index 5a65dfab77..5d5e8b4553 100644
--- a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
+++ b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
@@ -864,7 +864,7 @@ public class CreateUserWizard extends BaseWizardBean
     protected void checkTenantUserName()
     {
         String currentDomain = tenantService.getCurrentUserDomain();
-        if (currentDomain != null)
+        if (! currentDomain.equals(TenantService.DEFAULT_DOMAIN))
         {
             if (! tenantService.isTenantUser(this.userName))
             {
diff --git a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
index 26c001ae9f..321957bed3 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
@@ -492,7 +492,7 @@ public class NewUserWizard extends AbstractWizardBean
             if (tenantService.isEnabled())
             {         
                 String currentDomain = tenantService.getCurrentUserDomain();
-                if (currentDomain != null)
+                if (! currentDomain.equals(TenantService.DEFAULT_DOMAIN))
                 {
                     if (! tenantService.isTenantUser(this.userName))
                     {