diff --git a/admin/configuration.php b/admin/configuration.php
index 98e07c9bf..82c16b8e7 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -136,6 +136,7 @@ if (isset($_POST['submit']))
           $order_by_inside_category = array();
           for ($i=0; $i<count($_POST['order_by_field']); $i++)
           {
+            if ($i>5) continue;
             if ($_POST['order_by_field'][$i] == '')
             {
               array_push($page['errors'], l10n('No field selected'));
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index fc5f42b26..85574ed4b 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -96,7 +96,7 @@
       </span>
     </li>
     
-    <li style="margin-top:20px;">
+    <li>
       &nbsp;
       <span class="property">
         {'Default photos order'|@translate}