diff --git a/src/tasks.php b/src/tasks.php
index e1a6ae273..120947569 100755
--- a/src/tasks.php
+++ b/src/tasks.php
@@ -361,6 +361,10 @@
       $copy = TaskUtils::getFromPretask($copy);
     }
   }
+  else if (isset($_GET["hashlist"])) {
+    $hashlistId = $_GET["hashlist"];
+  }
+
   if ($copy === null) {
     $copy = TaskUtils::getDefault();
   }
diff --git a/src/templates/hashlists/detail.template.html b/src/templates/hashlists/detail.template.html
index a647799d8..63e888f8e 100644
--- a/src/templates/hashlists/detail.template.html
+++ b/src/templates/hashlists/detail.template.html
@@ -181,13 +181,20 @@ <h2>Hashlist details</h2>
                   </form>
                 {{ENDIF}}
                 {{IF [[list.getVal('hashlist')->getCracked()]] < [[list.getVal('hashlist')->getHashCount()]] && [[accessControl.hasPermission([[$DAccessControl::MANAGE_HASHLIST_ACCESS]])]]}}
-                  <form style='float: left;' action="hashlists.php?id=[[list.getVal('hashlist')->getId()]]" method='post'>
+                  <form style='float: left; margin: 0px 5px;' action="hashlists.php?id=[[list.getVal('hashlist')->getId()]]" method='post'>
                     <input type='hidden' name='action' value='[[$DHashlistAction::ZAP_HASHLIST]]'>
                     <input type='hidden' name='hashlist' value="[[list.getVal('hashlist')->getId()]]">
                     <input type="hidden" name="csrf" value="[[csrf]]">
                     <input type='submit' class='btn {{IF [[toggledarkmode]] > 0}}btn-primary{{ELSE}}btn-light{{ENDIF}}' value='Import pre-cracked hashes'>
                   </form>
                 {{ENDIF}}
+                {{IF [[list.getVal('hashlist')->getCracked()]] < [[list.getVal('hashlist')->getHashCount()]] && [[accessControl.hasPermission([[$DAccessControl::CREATE_TASK_ACCESS]])]]}}
+                  <form style='float: left; margin: 0px 5px;' action="tasks.php" method='get'>
+                    <input type='hidden' name='new' value='true'>
+                    <input type='hidden' name='hashlist' value="[[list.getVal('hashlist')->getId()]]">
+                    <input type='submit' class='btn {{IF [[toggledarkmode]] > 0}}btn-primary{{ELSE}}btn-light{{ENDIF}}' value='Create New Task'>
+                  </form>
+                {{ENDIF}}
               </div>
             </div>
           </div>