diff --git a/include/class.export.php b/include/class.export.php
index 3a47bcc942e358d51fa6615bbd9d065a887182ba..1cf4d9bf49a9651c30af925ee5fd7fe4bcc47fc3 100644
--- a/include/class.export.php
+++ b/include/class.export.php
@@ -57,6 +57,10 @@ class Export {
             $fields[$key] = $f;
             $cdata[$key] = $f->getLocal('label');
         }
+
+        if (!is_array($target))
+          $target = CustomQueue::getExportableFields() + $cdata;
+
         // Reset the $sql query
         $tickets = $sql->models()
             ->select_related('user', 'user__default_email', 'dept', 'staff',
diff --git a/scp/users.php b/scp/users.php
index 047d0f91cdc1229c465673be570a6bf109c8db02..a905981fd3c6a4204f1981c6640e05bc6af5f38d 100644
--- a/scp/users.php
+++ b/scp/users.php
@@ -184,7 +184,7 @@ if ($user ) {
         } elseif ($_REQUEST['a'] == 'export' && ($query=$_SESSION[':U:tickets'])) {
             $filename = sprintf('%s-tickets-%s.csv',
                     $user->getName(), strftime('%Y%m%d'));
-            if (!Export::saveTickets($query, $filename, 'csv'))
+            if (!Export::saveTickets($query, '', $filename, 'csv'))
                 $errors['err'] = __('Unable to dump query results.')
                     .' '.__('Internal error occurred');
         }