diff --git a/bin/backend/controls/OutputDialog.js b/bin/backend/controls/OutputDialog.js
index f8d2e4fa2a18f03a4ee887e8c836bd1820bc5f11..0c88ea12746465648559dc7c4d1390ab9162b68e 100644
--- a/bin/backend/controls/OutputDialog.js
+++ b/bin/backend/controls/OutputDialog.js
@@ -245,7 +245,8 @@ define('package/quiqqer/erp/bin/backend/controls/OutputDialog', [
                 Form.elements.template.addEvent('change', function (event) {
                     self.$Template = {
                         id      : event.target.value,
-                        provider: event.target.get('data-provider')
+                        provider: event.target.getElement('option[value="' + event.target.value + '"]')
+                            .get('data-provider')
                     };
 
                     self.$renderPreview();
@@ -373,8 +374,8 @@ define('package/quiqqer/erp/bin/backend/controls/OutputDialog', [
                         id   : entityId,
                         t    : self.getAttribute('entityType'),
                         oid  : self.getId(),
-                        tpl  : Form.elements.template.value,
-                        tplpr: Form.elements.template.get('data-provider')
+                        tpl  : self.$Template.id,
+                        tplpr: self.$Template.provider
                     }),
                     id    : id,
                     styles: {
@@ -427,8 +428,8 @@ define('package/quiqqer/erp/bin/backend/controls/OutputDialog', [
                         id   : entityId,
                         t    : self.getAttribute('entityType'),
                         oid  : self.getId(),
-                        tpl  : Form.elements.template.value,
-                        tplpr: Form.elements.template.get('data-provider')
+                        tpl  : self.$Template.id,
+                        tplpr: self.$Template.provider
                     }),
                     id    : id,
                     styles: {
@@ -584,8 +585,8 @@ define('package/quiqqer/erp/bin/backend/controls/OutputDialog', [
                     'package'       : 'quiqqer/erp',
                     entityId        : self.getAttribute('entityId'),
                     entityType      : self.getAttribute('entityType'),
-                    template        : Form.elements.template.value,
-                    templateProvider: Form.elements.template.get('data-provider'),
+                    template        : self.$Template.id,
+                    templateProvider: self.$Template.provider,
                     mailSubject     : self.$Mail.subject,
                     mailContent     : self.$Mail.content,
                     onError         : reject
diff --git a/locale.xml b/locale.xml
index 152db0286a6ca18ecc736ee9f882ca2be97ecffb..88807e8e991cc08b362b21b2be34b03a4a83df43 100644
--- a/locale.xml
+++ b/locale.xml
@@ -416,8 +416,8 @@
             <en><![CDATA[No templates found]]></en>
         </locale>
         <locale name="controls.OutputDialog.no_preview">
-            <de><![CDATA[Die Vorschau ist aktuell nicht verfügbar, da keine Vorlage ausgewählt oder gefunden wurde.]]></de>
-            <en><![CDATA[The preview is currently not available because no template was selected or found.]]></en>
+            <de><![CDATA[Das Dokument ist aktuell nicht verfügbar, da keine Vorlage ausgewählt oder gefunden wurde.]]></de>
+            <en><![CDATA[The document is currently not available because no template was selected or found.]]></en>
         </locale>
         <locale name="controls.OutputDialog.preview_error">
             <de><![CDATA[Die Vorschau konnte leider nicht geladen werden. Bitte prüfen Sie die Fehler-Logs oder kontaktieren Sie einen Administrator.]]></de>
diff --git a/src/QUI/ERP/Output/Output.php b/src/QUI/ERP/Output/Output.php
index 0c62fd2c6e6698f0a99d59afb6125720d210a694..10491eabdbaf3eb8732fae71e25b5fc465554405 100644
--- a/src/QUI/ERP/Output/Output.php
+++ b/src/QUI/ERP/Output/Output.php
@@ -400,16 +400,16 @@ protected static function getAllOutputProviders()
                 }
 
                 /** @var OutputProviderInterface $class */
-                $class = $packageProvider['erpOutput'][0];
+                foreach ($packageProvider['erpOutput'] as $class) {
+                    if (!\class_exists($class)) {
+                        continue;
+                    }
 
-                if (!\class_exists($class)) {
-                    continue;
+                    $providerClasses[] = [
+                        'class'   => $class,
+                        'package' => $installedPackage['name']
+                    ];
                 }
-
-                $providerClasses[] = [
-                    'class'   => $class,
-                    'package' => $installedPackage['name']
-                ];
             } catch (QUI\Exception $Exception) {
                 QUI\System\Log::writeException($Exception);
             }
@@ -443,17 +443,17 @@ protected static function getAllOutputTemplateProviders()
                 }
 
                 /** @var OutputTemplateProviderInterface $class */
-                $class = $packageProvider['erpOutputTemplate'][0];
+                foreach ($packageProvider['erpOutputTemplate'] as $class) {
+                    if (!\class_exists($class)) {
+                        continue;
+                    }
 
-                if (!\class_exists($class)) {
-                    continue;
+                    $providerClasses[] = [
+                        'class'           => $class,
+                        'package'         => $installedPackage['name'],
+                        'isSystemDefault' => $installedPackage['name'] === 'quiqqer/invoice-accounting-template'
+                    ];
                 }
-
-                $providerClasses[] = [
-                    'class'           => $class,
-                    'package'         => $installedPackage['name'],
-                    'isSystemDefault' => $installedPackage['name'] === 'quiqqer/invoice-accounting-template'
-                ];
             } catch (QUI\Exception $Exception) {
                 QUI\System\Log::writeException($Exception);
             }