diff --git a/libraries/config.default.php b/libraries/config.default.php
index 925fa755ec..964474fab6 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2234,6 +2234,144 @@ $cfg['Import']['xls_empty_rows'] = true;
  */
 $cfg['Import']['xlsx_col_names'] = false;
 
+/*******************************************************************************
+ * Schema export defaults
+*/
+$cfg['Schema'] = array();
+
+/**
+ * pdf/eps/dia/svg
+ *
+ * @global string $cfg['Schema']['format']
+*/
+$cfg['Schema']['format'] = 'pdf';
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['pdf_show_color']
+ */
+$cfg['Schema']['pdf_show_color'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['pdf_show_keys']
+ */
+$cfg['Schema']['pdf_show_keys'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['pdf_all_tables_same_width']
+ */
+$cfg['Schema']['pdf_all_tables_same_width'] = false;
+
+/**
+ * L/P
+ *
+ * @global string $cfg['Schema']['pdf_orientation']
+ */
+$cfg['Schema']['pdf_orientation'] = 'L';
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['pdf_paper']
+ */
+$cfg['Schema']['pdf_paper'] = 'A4';
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['pdf_show_grid']
+ */
+$cfg['Schema']['pdf_show_grid'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['pdf_with_doc']
+ */
+$cfg['Schema']['pdf_with_doc'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['dia_show_color']
+ */
+$cfg['Schema']['dia_show_color'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['dia_show_keys']
+ */
+$cfg['Schema']['dia_show_keys'] = false;
+
+/**
+ * L/P
+ *
+ * @global string $cfg['Schema']['dia_orientation']
+ */
+$cfg['Schema']['dia_orientation'] = 'L';
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['dia_paper']
+ */
+$cfg['Schema']['dia_paper'] = 'A4';
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['eps_show_color']
+ */
+$cfg['Schema']['eps_show_color'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['eps_show_keys']
+ */
+$cfg['Schema']['eps_show_keys'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['eps_all_tables_same_width']
+ */
+$cfg['Schema']['eps_all_tables_same_width'] = false;
+
+/**
+ * L/P
+ *
+ * @global string $cfg['Schema']['eps_orientation']
+ */
+$cfg['Schema']['eps_orientation'] = 'L';
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['svg_show_color']
+ */
+$cfg['Schema']['svg_show_color'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['svg_show_keys']
+ */
+$cfg['Schema']['svg_show_keys'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Schema']['svg_all_tables_same_width']
+ */
+$cfg['Schema']['svg_all_tables_same_width'] = false;
+
 /*******************************************************************************
  * PDF options
  */
diff --git a/libraries/designer.lib.php b/libraries/designer.lib.php
index 0fd7da31c2..a8dd5bb60c 100644
--- a/libraries/designer.lib.php
+++ b/libraries/designer.lib.php
@@ -165,7 +165,7 @@ function PMA_getHtmlForSchemaExport($db, $page)
     $htmlString .= '<label>' . __('Select Export Relational Type')
         . '</label><br />';
     $htmlString .= PMA_pluginGetChoice(
-        'Schema', 'export_type', $export_list, 'schema_export_format'
+        'Schema', 'export_type', $export_list, 'format'
     );
     $htmlString .= '<input type="hidden" name="chpage"'
         . ' value="' . htmlspecialchars($page) . '" />';
diff --git a/schema_export.php b/schema_export.php
index 538e37de55..80d07e54a3 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -75,7 +75,7 @@ function PMA_processExportSchema($export_type)
 
     // get the specific plugin
     $export_plugin = PMA_getPlugin(
-        "Schema",
+        "schema",
         $export_type,
         'libraries/plugins/schema/'
     );