diff --git a/install/core/Installer.php b/install/core/Installer.php
index 803315155b..9a09b2e071 100644
--- a/install/core/Installer.php
+++ b/install/core/Installer.php
@@ -660,10 +660,13 @@ class Installer
                     $value = (int) $value;
 
                 case 'enum':
-                    if (isset($paramDefs['options']) && array_key_exists($value, $paramDefs['options'])) {
+                    if (
+                        isset($paramDefs['options']) && array_key_exists($value, $paramDefs['options']) ||
+                        !isset($paramDefs['options'])
+                    ) {
                         $normalizedParams[$name] = $value;
                     }
-                    else if (array_key_exists('default', $paramDefs)) {
+                    else if (isset($paramDefs['options']) && array_key_exists('default', $paramDefs)) {
                         $normalizedParams[$name] = $paramDefs['default'];
 
                         $GLOBALS['log']->warning(
diff --git a/install/core/tpl/step4.tpl b/install/core/tpl/step4.tpl
index 03230fcf80..4ba74cfb85 100644
--- a/install/core/tpl/step4.tpl
+++ b/install/core/tpl/step4.tpl
@@ -10,11 +10,11 @@
                         </label>
                         <div class="field field-dateFormat">
                             <select name="dateFormat" class="form-control main-element">
-                                {foreach from=$fields['dateFormat'].options item=lbl key=val}
+                                {foreach from=$fields['dateFormat'].options item=val}
                                     {if $val == $fields['dateFormat'].value}
-                                        <option selected="selected" value="{$val}">{$lbl}</option>
+                                        <option selected="selected" value="{$val}">{$val}</option>
                                     {else}
-                                        <option value="{$val}">{$lbl}</option>
+                                        <option value="{$val}">{$val}</option>
                                     {/if}
                                 {/foreach}
                             </select>
@@ -27,11 +27,11 @@
                         </label>
                         <div class="field field-timeFormat">
                             <select name="timeFormat" class="form-control main-element">
-                                {foreach from=$fields['timeFormat'].options item=lbl key=val}
+                                {foreach from=$fields['timeFormat'].options item=val}
                                     {if $val == $fields['timeFormat'].value}
-                                        <option selected="selected" value="{$val}">{$lbl}</option>
+                                        <option selected="selected" value="{$val}">{$val}</option>
                                     {else}
-                                        <option value="{$val}">{$lbl}</option>
+                                        <option value="{$val}">{$val}</option>
                                     {/if}
                                 {/foreach}
                             </select>