diff --git a/SettingsHelper.js b/SettingsHelper.js
index 8d410a76..1679f757 100644
--- a/SettingsHelper.js
+++ b/SettingsHelper.js
@@ -4,6 +4,7 @@ const settings = require('./settings.json');
 
 module.exports = function () {
   const fields = [
+    // Webapp settings
     {
       local: 'webroot',
       env: 'WEB_ROOT',
@@ -19,16 +20,6 @@ module.exports = function () {
       env: 'WEB_ACCESSURL',
       default: ''
     },
-    {
-      local: 'serverroot',
-      env: 'SERVER_ROOT',
-      default: '/slserver'
-    },
-    {
-      local: 'server_port',
-      env: 'SERVER_PORT',
-      default: '8089'
-    },
     {
       local: 'autoJoin',
       env: 'AUTOJOIN_ENABLED',
@@ -58,6 +49,17 @@ module.exports = function () {
       local: 'servers',
       env: 'SERVERS',
       default: ''
+    },
+    // Server settings
+    {
+      local: 'serverroot',
+      env: 'SERVER_ROOT',
+      default: '/slserver'
+    },
+    {
+      local: 'server_port',
+      env: 'SERVER_PORT',
+      default: '8089'
     }
   ];
   // Load and export our settings in preference of Args -> ENV -> Settings file -> Default