diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
index 263e8b5421..4dbe70448f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
@@ -117,7 +117,7 @@
             <div class="taskValue">
                <select id="wrkType" style="width: 178px;">
                   <option value="review" selected>${message("office.workflow.review")}</option>
-                  <option value="adhoc">${message("office.workflow.review")}</option>
+                  <option value="adhoc">${message("office.workflow.adhoc")}</option>
                </select>
             </div>
             <div class="taskParam">${message("office.property.assign_to")}:</div>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/dashlets/my-tasks.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/dashlets/my-tasks.get.json.ftl
index d33f3fd924..fc0eef1a1b 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/dashlets/my-tasks.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/dashlets/my-tasks.get.json.ftl
@@ -45,8 +45,8 @@
       [
 <#list task.transitions as transition>
          {
-            "id": "${transition.id}",
-            "label": "${transition.label}"
+            "id": "${transition.id!""}",
+            "label": "${transition.label!""}"
          }<#if transition_has_next>,</#if>
 </#list>
       ]