diff --git a/app/controllers/admin/configuration.php b/app/controllers/admin/configuration.php
index 802eebe2e5e69a0c44005c6a816254a6425be815..1e6b3c352fe76e5f13180d64d7ae695fd4f4bf33 100644
--- a/app/controllers/admin/configuration.php
+++ b/app/controllers/admin/configuration.php
@@ -80,8 +80,6 @@ class Admin_ConfigurationController extends AuthenticatedController
      */
     public function edit_configuration_action()
     {
-
-
         $field = Request::get('field');
         $value = Request::get('value');
 
diff --git a/lib/classes/Config.class.php b/lib/classes/Config.class.php
index e99889440086ca4f5016de7cd2d03f69624c337d..f5afaab3ebd17bba6de8f178eadb36a52a4b93eb 100644
--- a/lib/classes/Config.class.php
+++ b/lib/classes/Config.class.php
@@ -105,9 +105,7 @@ class Config implements ArrayAccess, Countable, IteratorAggregate
             });
         }
 
-        $fields = array_keys($temp);
-        sort($fields, SORT_NATURAL |  SORT_FLAG_CASE);
-        return $fields;
+        return array_keys($temp);
     }
 
     /**
diff --git a/lib/classes/ConfigurationModel.php b/lib/classes/ConfigurationModel.php
index 6aa15f627df5706055fd5d0481d867d17d952af3..9ce5a38e1f8d074df9561d53587c725cf7b9710d 100644
--- a/lib/classes/ConfigurationModel.php
+++ b/lib/classes/ConfigurationModel.php
@@ -57,6 +57,11 @@ class ConfigurationModel
                 $allconfigs[] = $metadata;
             }
         }
+
+        usort($allconfigs, function ($a, $b) {
+            return strcmp($a['field'], $b['field']);
+        });
+
         return $allconfigs;
     }