diff --git a/settings_defaults.php b/settings_defaults.php
index ae91228d..66a65f03 100644
--- a/settings_defaults.php
+++ b/settings_defaults.php
@@ -19,6 +19,27 @@ require_once("inc_all_settings.php"); ?>
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label>Calendar</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                        </div>
+                        <select class="form-control select2" name="calendar">
+                            <option value="0">- None -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * FROM calendars ORDER BY calendar_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $calendar_id = intval($row['calendar_id']);
+                                $calendar_name = nullable_htmlentities($row['calendar_name']); ?>
+                                <option <?php if ($config_default_calendar == $calendar_id) { echo "selected"; } ?> value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label>Transfer From Account</label>
                     <div class="input-group">
@@ -143,27 +164,6 @@ require_once("inc_all_settings.php"); ?>
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label>Calendar</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                        </div>
-                        <select class="form-control select2" name="calendar">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT * FROM calendars ORDER BY calendar_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $calendar_id = intval($row['calendar_id']);
-                                $calendar_name = nullable_htmlentities($row['calendar_name']); ?>
-                                <option <?php if ($config_default_calendar == $calendar_id) { echo "selected"; } ?> value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label>Net Terms</label>
                     <div class="input-group">
diff --git a/settings_side_nav.php b/settings_side_nav.php
index 4db1f868..2f606f62 100644
--- a/settings_side_nav.php
+++ b/settings_side_nav.php
@@ -112,7 +112,14 @@
           </a>
         </li>
 
-        <?php if ($config_module_enable_accounting) { ?>
+        <li class="nav-item">
+          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_alerts.php") { echo "active"; } ?>"
+            href="settings_alerts.php">
+            <i class="nav-icon far fa-bell"></i>
+            <p>Alerts</p>
+          </a>
+        </li>
+
         <li class="nav-item">
           <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_defaults.php") { echo "active"; } ?>"
             href="settings_defaults.php">
@@ -121,6 +128,8 @@
           </a>
         </li>
 
+        <?php if ($config_module_enable_accounting) { ?>
+
         <li class="nav-item">
           <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_invoice.php") { echo "active"; } ?>"
             href="settings_invoice.php">
@@ -137,14 +146,6 @@
           </a>
         </li>
 
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_alerts.php") { echo "active"; } ?>"
-            href="settings_alerts.php">
-            <i class="nav-icon far fa-bell"></i>
-            <p>Alerts</p>
-          </a>
-        </li>
-
         <li class="nav-item">
           <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_online_payment.php") { echo "active"; } ?>"
             href="settings_online_payment.php">