diff --git a/config/alfresco/workflow-context.xml b/config/alfresco/workflow-context.xml
index f964351e08..f596c6f4ce 100644
--- a/config/alfresco/workflow-context.xml
+++ b/config/alfresco/workflow-context.xml
@@ -29,6 +29,7 @@
 	  <property name="avmSyncService" ref="AVMSyncService"/>
 	  <property name="dictionaryService" ref="dictionaryService"/>
 	  <property name="protectedNodeService" ref="NodeService"/>
+	  <property name="services" ref="ServiceRegistry"/>
    </bean>
 
    <bean id="workflowPackageImpl" class="org.alfresco.repo.workflow.WorkflowPackageImpl">
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
index f4b05f4871..55d14aa976 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
@@ -31,6 +31,7 @@ import java.util.Set;
 import org.alfresco.model.ContentModel;
 import org.alfresco.model.WCMModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
+import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -77,6 +78,7 @@ public class WorkflowServiceImpl implements WorkflowService
     private AVMSyncService avmSyncService;
     private DictionaryService dictionaryService;
     private NodeService protectedNodeService;
+    private ServiceRegistry services;
 
     /**
      * Sets the Authority Service
@@ -157,6 +159,16 @@ public class WorkflowServiceImpl implements WorkflowService
     {
         this.protectedNodeService = protectedNodeService;
     }
+    
+    /**
+     * Set the service registry
+     * 
+     * @param services  service registry
+     */
+    public void setServices(ServiceRegistry services)
+    {
+        this.services = services;
+    }
 
     /*
      * (non-Javadoc)
@@ -693,6 +705,27 @@ public class WorkflowServiceImpl implements WorkflowService
             WorkflowInstance instance = task.getPath().getInstance();
             workflowPackageComponent.setWorkflowForPackage(instance);
         }
+        
+        // Get the start task
+        String instanceId = task.getPath().getInstance().getId();
+        WorkflowTask startTask = component.getStartTask(instanceId);
+        
+        // Get the email notification flag
+        Boolean sendEMailNotification = (Boolean) startTask.getProperties().get(WorkflowModel.PROP_SEND_EMAIL_NOTIFICATIONS);
+        
+        // Get the 'new' assignee
+        String assignee = (String)properties.get(ContentModel.PROP_OWNER);
+        if (assignee != null && assignee.length() != 0 &&
+            Boolean.TRUE.equals(sendEMailNotification) == true)
+        {
+            // Send the notification
+            WorkflowNotificationUtils.sendWorkflowAssignedNotificationEMail(
+                        services, 
+                        taskId,
+                        assignee,
+                        false);
+        }
+        
         return task;
     }