diff --git a/src/getFound.php b/src/getFound.php
index 51b6242f7..a9bd4f455 100644
--- a/src/getFound.php
+++ b/src/getFound.php
@@ -58,7 +58,10 @@
         foreach ($current as $entry) {
           $output .= $entry->getHash();
           if (strlen($entry->getSalt()) > 0) {
-            $output .= "\t" . $entry->getSalt();
+            $salts = explode($hashlist->getSaltSeparator(), $entry->getSalt()); // Double salt
+            foreach ($salts as $salt) {
+              $output .= "\t" . $salt;
+            }
           }
           $output .= "\tFF" . $lineDelimiter;
         }
diff --git a/src/getHashlist.php b/src/getHashlist.php
index ea35c8802..715164b3d 100644
--- a/src/getHashlist.php
+++ b/src/getHashlist.php
@@ -69,10 +69,14 @@
         
         $output = "";
         $count += sizeof($current);
+        
         foreach ($current as $entry) {
           $output .= $entry->getHash();
           if (strlen($entry->getSalt()) > 0) {
-            $output .= "\t" . $entry->getSalt();
+            $salts = explode($hashlist->getSaltSeparator(), $entry->getSalt()); // Double salt
+            foreach ($salts as $salt) {
+              $output .= "\t" . $salt;
+            }
           }
           $output .= $lineDelimiter;
         }
diff --git a/src/inc/api/APISendProgress.class.php b/src/inc/api/APISendProgress.class.php
index fdcf762b5..a47a081d7 100644
--- a/src/inc/api/APISendProgress.class.php
+++ b/src/inc/api/APISendProgress.class.php
@@ -236,6 +236,10 @@ public function execute($QUERY = array()) {
             $plain = $splitLine[2]; // if hash is salted
             $crackPos = $splitLine[4];
           }
+          else if (sizeof($splitLine) == 6) { // Doulbe salt
+            $plain = $splitLine[3]; // if hash is salted
+            $crackPos = $splitLine[5];
+          }
           else {
             $plain = $splitLine[1];
             $crackPos = $splitLine[3];
diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php
index c06cacc50..ff723fc34 100644
--- a/src/inc/utils/TaskUtils.class.php
+++ b/src/inc/utils/TaskUtils.class.php
@@ -1323,7 +1323,10 @@ public static function getCrackedHashes($taskId, $user) {
         "crackpos" => $entry->getCrackPos()
       ];
       if (strlen($entry->getSalt()) > 0) {
-        $arr["hash"] .= $hashlist->getSaltSeparator() . $entry->getSalt();
+        $salts = explode($hashlist->getSaltSeparator(), $entry->getSalt()); // Double salt
+        foreach ($salts as $salt) {
+          $arr["hash"] .= $hashlist->getSaltSeparator() . $salt;
+        }
       }
       $hashes[] = $arr;
     }