diff --git a/config/alfresco/workflow/hybrid-adhoc.bpmn20.xml b/config/alfresco/workflow/hybrid-adhoc.bpmn20.xml
index 1324dab4a8..b7bf5b6d0e 100644
--- a/config/alfresco/workflow/hybrid-adhoc.bpmn20.xml
+++ b/config/alfresco/workflow/hybrid-adhoc.bpmn20.xml
@@ -19,7 +19,7 @@
             sourceRef='start'
             targetRef='adhocTask' />
 
-        <userTask id="adhocTask" name="Review Task"
+        <userTask id="adhocTask" name="Adhoc Task"
             activiti:formKey="wf:adhocTask">
            <extensionElements>
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
diff --git a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskNotificationListener.java b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskNotificationListener.java
index 68782038b3..82c052d5c7 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskNotificationListener.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskNotificationListener.java
@@ -121,14 +121,14 @@ public class TaskNotificationListener implements TaskListener
             TypeDefinition typeDefinition = propertyConverter.getWorkflowObjectFactory().getTaskTypeDefinition(taskFormKey, false);
             taskFormKey = typeDefinition.getName().toPrefixString();
             
-            if(taskFormKey != null) 
+            if (taskFormKey != null) 
             {
                 String processDefinitionKey = ((ProcessDefinition) ((TaskEntity)task).getExecution().getProcessDefinition()).getKey();
                 String defName = propertyConverter.getWorkflowObjectFactory().buildGlobalId(processDefinitionKey);
                 title = propertyConverter.getWorkflowObjectFactory().getTaskTitle(typeDefinition, defName, task.getName(), taskFormKey.replace(":", "_"));
             }
             
-            if(title == null)
+            if (title == null)
             {
                 if (task.getName() != null)
                 {
@@ -139,12 +139,20 @@ public class TaskNotificationListener implements TaskListener
                     title = taskFormKey.replace(":", "_");
                 }
             }
+            
+            // Make sure a description is present
+            String description = task.getDescription();
+            if (description == null || description.length() == 0)
+            {
+            	// use the task title as the description
+            	description = title;
+            }
 
             // Send email notification
             workflowNotificationUtils.sendWorkflowAssignedNotificationEMail(
                     ActivitiConstants.ENGINE_ID + "$" + task.getId(),
                     title,
-                    task.getDescription(),
+                    description,
                     task.getDueDate(),
                     Integer.valueOf(task.getPriority()),
                     workflowPackage,