diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AbstractMvcAuthoringStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AbstractMvcAuthoringStep.java
index 8ad84a26d..2d3cba3db 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AbstractMvcAuthoringStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AbstractMvcAuthoringStep.java
@@ -243,6 +243,7 @@ public abstract class AbstractMvcAuthoringStep implements MvcAuthoringStep {
             );
         final String docPath = Optional
             .ofNullable(documentPath)
+            .map(this::withoutLeadingSlash)
             .orElseThrow(
                 () -> new WebApplicationException(
                     String.format(
@@ -377,4 +378,11 @@ public abstract class AbstractMvcAuthoringStep implements MvcAuthoringStep {
             .orElse("");
     }
 
+    private String withoutLeadingSlash(final String path) {
+        if (path.startsWith("/")) {
+            return path.substring(1);
+        } else {
+            return path;
+        }
+    }
 }
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentWorkflowController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentWorkflowController.java
index 7b7e0e10e..e972976d7 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentWorkflowController.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentWorkflowController.java
@@ -128,7 +128,7 @@ public class DocumentWorkflowController {
      * @return A redirect to the {@code returnUrl}.
      */
     @POST
-    @Path("/tasks/${taskIdentifier}/@lock")
+    @Path("/tasks/{taskIdentifier}/@lock")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String lockTask(
@@ -185,7 +185,7 @@ public class DocumentWorkflowController {
      * @return A redirect to the {@code returnUrl}.
      */
     @POST
-    @Path("/tasks/${taskIdentifier}/@unlock")
+    @Path("/tasks/{taskIdentifier}/@unlock")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String unlockTask(
@@ -243,7 +243,7 @@ public class DocumentWorkflowController {
      * @return A redirect to the {@code returnUrl}.
      */
     @POST
-    @Path("/tasks/${taskIdentifier}/@finish")
+    @Path("/tasks/{taskIdentifier}/@finish")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String finishTask(
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java
index f2788cbfe..04107922c 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java
@@ -298,6 +298,12 @@ public class SelectedDocumentModel {
                 .orElse(false)
         );
         entry.setLocked(task.isLocked());
+        entry.setLockedByCurrentUser(
+            shiro
+            .getUser()
+            .map(user -> Objects.equals(user, task.getLockingUser()))
+            .orElse(false)
+        );
 
         return entry;
     }
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/TaskListEntry.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/TaskListEntry.java
index 8946f77e1..ebcabd1cd 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/TaskListEntry.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/TaskListEntry.java
@@ -69,6 +69,11 @@ public class TaskListEntry {
      * Is the task locked?
      */
     private boolean locked;
+    
+    /**
+     * Is the task locked by the current user?
+     */
+    private boolean lockedByCurrentUser;
 
     public String getTaskUuid() {
         return taskUuid;
@@ -126,4 +131,14 @@ public class TaskListEntry {
         this.locked = locked;
     }
 
+    public boolean isLockedByCurrentUser() {
+        return lockedByCurrentUser;
+    }
+
+    public void setLockedByCurrentUser(final boolean lockedByCurrentUser) {
+        this.lockedByCurrentUser = lockedByCurrentUser;
+    }
+
+    
+    
 }
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml
index 9a6177890..aaf8c8db7 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml
@@ -45,59 +45,65 @@
                                 <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@workflow/@start"
                                       method="post">
                                     <input name="returnUrl"
-                                               type="hidden"
-                                               value="#{CmsArticlePropertiesStep.stepPath}" />
-                                    
+                                           type="hidden"
+                                           value="#{CmsArticlePropertiesStep.stepPath}" />
+
                                     <button class="btn btn-primary" 
-                                                type="submit">
-                                            #{CmsAdminMessages['contentsection.document.authoring.workflow.start']}
-                                        </button>
+                                            type="submit">
+                                        #{CmsAdminMessages['contentsection.document.authoring.workflow.start']}
+                                    </button>
                                 </form>
                             </c:otherwise>
                         </c:choose>
                         <c:if test="#{CmsSelectedDocumentModel.currentTask != null}">
                             <c:choose>
-                                <c:when test="#{CmsSelectedDocumentModel.currentTask.assignedToCurrentUser and CmsSelectedDocumentModel.currentTask.locked}">
-                                    <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@workflow/tasks/UUID-#{CmsSelectedDocumentModel.currentTask.taskUuid}/@unlock"
-                                          method="post">
-                                        <input name="returnUrl"
-                                               type="hidden"
-                                               value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringsteps/#{authoringStep}" />
-                                        <button class="btn btn-secondary btn-sm" 
-                                                type="submit">
-                                            #{CmsAdminMessages['contentsection.document.authoring.workflow.active_task.release']}
-                                        </button>
-                                    </form>
-                                    <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@workflow/tasks/UUID-#{CmsSelectedDocumentModel.currentTask.taskUuid}/@finish"
-                                          method="post">
-                                        <input name="returnUrl"
-                                               type="hidden"
-                                               value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringsteps/#{authoringStep}" />
-                                        <button class="btn btn-secondary btn-sm" 
-                                                type="submit">
-                                            #{CmsAdminMessages['contentsection.document.authoring.workflow.active_task.finish']}
-                                        </button>
-                                    </form>
+                                <c:when test="#{(CmsSelectedDocumentModel.currentTask.assignedToCurrentUser or CmsSelectedDocumentModel.currentTask.lockedByCurrentUser)and CmsSelectedDocumentModel.currentTask.locked}">
+                                    <div class="d-flex">
+                                        <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@workflow/tasks/UUID-#{CmsSelectedDocumentModel.currentTask.taskUuid}/@unlock"
+                                              class="mr-2"
+                                              method="post">
+                                            <input name="returnUrl"
+                                                   type="hidden"
+                                                   value="#{CmsArticlePropertiesStep.stepPath}" />
+                                            <button class="btn btn-secondary btn-sm" 
+                                                    type="submit">
+                                                #{CmsAdminMessages['contentsection.document.authoring.workflow.active_task.release']}
+                                            </button>
+                                        </form>
+                                        <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@workflow/tasks/UUID-#{CmsSelectedDocumentModel.currentTask.taskUuid}/@finish"
+                                              class="ml-2"
+                                              method="post">
+                                            <input name="returnUrl"
+                                                   type="hidden"
+                                                   value="#{CmsArticlePropertiesStep.stepPath}" />
+                                            <button class="btn btn-secondary btn-sm" 
+                                                    type="submit">
+                                                #{CmsAdminMessages['contentsection.document.authoring.workflow.active_task.finish']}
+                                            </button>
+                                        </form>
+                                    </div>
                                 </c:when>
                                 <c:when test="#{CmsSelectedDocumentModel.currentTask.locked and CmsSelectedDocumentModel.canChangeWorkflow}">
                                     <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@workflow/tasks/UUID-#{CmsSelectedDocumentModel.currentTask.taskUuid}/@lock"
                                           method="post">
                                         <input name="returnUrl"
                                                type="hidden"
-                                               value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringsteps/#{authoringStep}" />
+                                               value="#{CmsArticlePropertiesStep.stepPath}" />
                                         <button class="btn btn-secondary btn-sm"
                                                 type="submit">
                                             #{CmsAdminMessages['contentsection.document.authoring.workflow.active_task.takeover']}
                                         </button>
                                     </form>
+
                                 </c:when>
                                 <c:when test="#{CmsSelectedDocumentModel.currentTask.assignedToCurrentUser or CmsSelectedDocumentModel.canChangeWorkflow}">
-                                    <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@workflow/tasks/UUID-#{CmsSelectedDocumentModel.currentTask.taskUuid}/@lock">
+                                    <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@workflow/tasks/UUID-#{CmsSelectedDocumentModel.currentTask.taskUuid}/@lock"
+                                          method="post">
                                         <input name="returnUrl"
                                                type="hidden"
-                                               value="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringsteps/#{authoringStep}" />
+                                               value="#{CmsArticlePropertiesStep.stepPath}" />
                                         <button class="btn btn-secondary btn-sm" 
-                                                type="button">
+                                                type="submit">
                                             #{CmsAdminMessages['contentsection.document.authoring.workflow.active_task.lock']}
                                         </button>
                                     </form>
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskManager.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskManager.java
index 973338c9f..4a384c400 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskManager.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskManager.java
@@ -220,7 +220,7 @@ public class AssignableTaskManager implements Serializable {
 
         return query.getResultList();
     }
-
+ 
     /**
      * Finishes a {@link AssignableTask}.
      *