diff --git a/config/alfresco/workflow-context.xml b/config/alfresco/workflow-context.xml
index fc68deb781..2194d39088 100644
--- a/config/alfresco/workflow-context.xml
+++ b/config/alfresco/workflow-context.xml
@@ -42,6 +42,7 @@
       <property name="authorityDAO" ref="authorityDAO"/>
       <property name="transactionService" ref="transactionService"/>
       <property name="fileFolderService" ref="FileFolderService"/>
+      <property name="tenantService" ref="tenantService"/>
    </bean>
 
    <bean id="workflowInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
index 4c6147bbc8..ec7b78b315 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
@@ -41,6 +41,7 @@ import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authority.AuthorityDAO;
+import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
@@ -86,7 +87,7 @@ public class WorkflowInterpreter extends BaseInterpreter
     private AVMSyncService avmSyncService;
     private PersonService personService;
     private FileFolderService fileFolderService;
-
+    private TenantService tenantService;
 
     /**
      * Current context
@@ -153,6 +154,14 @@ public class WorkflowInterpreter extends BaseInterpreter
         this.nodeService = nodeService;
     }
 
+    /**
+     * @param tenantService The Tenant Service
+     */  
+    public void setTenantService(TenantService tenantService)
+    {
+        this.tenantService = tenantService;
+    }
+
     /**
      * @param avmService  The AVM Service
      */
@@ -841,7 +850,11 @@ public class WorkflowInterpreter extends BaseInterpreter
         {
             if (command.length == 2)
             {
-            	setCurrentUserName(command[1]);
+                if (tenantService.isEnabled())
+                {
+                    tenantService.checkDomainUser(command[1]);
+                }
+                setCurrentUserName(command[1]);
             }
             out.println("using user " + getCurrentUserName());
         }