diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php
index 83b116e41d..6c7958edd5 100644
--- a/libraries/classes/Display/Export.php
+++ b/libraries/classes/Display/Export.php
@@ -325,29 +325,19 @@ class Export
     public static function getHtmlForExportOptionsOutputSaveDir()
     {
         global $cfg;
-        $html  = '<li>';
-        $html .= '<input type="checkbox" name="onserver" value="saveit" ';
-        $html .= 'id="checkbox_dump_onserver" ';
-        $html .= self::exportCheckboxCheck('onserver');
-        $html .= '/>';
-        $html .= '<label for="checkbox_dump_onserver">';
-        $html .= sprintf(
-            __('Save on server in the directory <b>%s</b>'),
-            htmlspecialchars(Util::userDir($cfg['SaveDir']))
+        $saveDir = Util::userDir($cfg['SaveDir']);
+        $exportIsChecked = (bool) self::exportCheckboxCheck(
+            'onserver'
+        );
+        $exportOverwriteIsChecked = (bool) self::exportCheckboxCheck(
+            'onserver_overwrite'
         );
-        $html .= '</label>';
-        $html .= '</li>';
-        $html .= '<li>';
-        $html .= '<input type="checkbox" name="onserver_overwrite" value="saveitover"';
-        $html .= ' id="checkbox_dump_onserver_overwrite" ';
-        $html .= self::exportCheckboxCheck('onserver_overwrite');
-        $html .= '/>';
-        $html .= '<label for="checkbox_dump_onserver_overwrite">';
-        $html .= __('Overwrite existing file(s)');
-        $html .= '</label>';
-        $html .= '</li>';
 
-        return $html;
+        return Template::get('display/export/options_output_save_dir')->render([
+            'save_dir' => $saveDir,
+            'export_is_checked' => $exportIsChecked,
+            'export_overwrite_is_checked' => $exportOverwriteIsChecked,
+        ]);
     }
 
 
diff --git a/templates/display/export/options_output_save_dir.twig b/templates/display/export/options_output_save_dir.twig
new file mode 100644
index 0000000000..b4526aa4bb
--- /dev/null
+++ b/templates/display/export/options_output_save_dir.twig
@@ -0,0 +1,15 @@
+<li>
+    <input type="checkbox" name="onserver" value="saveit"
+        id="checkbox_dump_onserver"{{ export_is_checked ? ' checked' }}>
+    <label for="checkbox_dump_onserver">
+        {{ 'Save on server in the directory <strong>%s</strong>'|trans|format(save_dir|e)|raw }}
+    </label>
+</li>
+<li>
+    <input type="checkbox" name="onserver_overwrite"
+        value="saveitover" id="checkbox_dump_onserver_overwrite"
+        {{- export_overwrite_is_checked ? ' checked' }}>
+    <label for="checkbox_dump_onserver_overwrite">
+        {% trans 'Overwrite existing file(s)' %}
+    </label>
+</li>
diff --git a/test/classes/Display/ExportTest.php b/test/classes/Display/ExportTest.php
index e98684dd04..012e1b3d2a 100644
--- a/test/classes/Display/ExportTest.php
+++ b/test/classes/Display/ExportTest.php
@@ -203,12 +203,12 @@ class ExportTest extends TestCase
 
         //validate 4: Export::getHtmlForExportOptionsQuickExport
         $this->assertContains(
-            '<input type="checkbox" name="onserver" value="saveit" ',
+            '<input type="checkbox" name="onserver" value="saveit"',
             $html
         );
         $dir = htmlspecialchars(Util::userDir($cfg['SaveDir']));
         $this->assertContains(
-            'Save on server in the directory <b>' . $dir . '</b>',
+            'Save on server in the directory <strong>' . $dir . '</strong>',
             $html
         );