diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
index 4dc17f6d8..5bcdbc53e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
@@ -60,9 +60,9 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
         return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
     }
     
-    protected Map<String, String> getSiteMaintenanceUrls(VitroRequest vreq) {
+    protected Map<String, Object> getSiteMaintenanceUrls(VitroRequest vreq) {
         
-        Map<String, String> urls = new HashMap<String, String>();
+        Map<String, Object> urls = new HashMap<>();
 
         if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) {
             urls.put("recomputeInferences", UrlBuilder.getUrl("/RecomputeInferences"));     
@@ -72,6 +72,11 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
 			urls.put("rebuildSearchIndex", UrlBuilder.getUrl("/SearchIndex"));
 		}
 		
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_STARTUP_STATUS.ACTION)) {
+        	urls.put("startupStatus", UrlBuilder.getUrl("/startupStatus"));
+        	urls.put("startupStatusAlert", !StartupStatus.getBean(getServletContext()).allClear());
+        }
+        
         if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.LOGIN_DURING_MAINTENANCE.ACTION)) {
             urls.put("restrictLogins", UrlBuilder.getUrl("/admin/restrictLogins"));
         }
@@ -145,11 +150,6 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
             data.put("pageManagement", UrlBuilder.getUrl("/pageList"));
         }
         
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_STARTUP_STATUS.ACTION)) {
-        	data.put("startupStatus", UrlBuilder.getUrl("/startupStatus"));
-        	data.put("startupStatusAlert", !StartupStatus.getBean(getServletContext()).allClear());
-        }
-        
         return data;
     }
     
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index 8ea8df055..63b624297 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -27,15 +27,6 @@
                 <li role="listitem"><a href="${siteConfig.siteInfo}" title="${i18n().site_information}">${i18n().site_information}</a></li>
             </#if>
             
-            <#if siteConfig.startupStatus?has_content>
-                <li role="listitem">
-                    <a href="${siteConfig.startupStatus}" title="${i18n().startup_status}">${i18n().startup_status}</a>
-                    <#if siteConfig.startupStatusAlert>
-                        <img id="alertIcon" src="${urls.images}/iconAlert.png" width="20" height="20" alt="${i18n().error_alert_icon}" />
-                    </#if>
-                </li>
-            </#if>   
-            
              <#if siteConfig.userAccounts?has_content>
                 <li role="listitem"><a href="${siteConfig.userAccounts}" title="${i18n().user_accounts}">${i18n().user_accounts}</a></li>
              </#if>        
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteMaintenance.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteMaintenance.ftl
index ab1a20189..36942779d 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteMaintenance.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteMaintenance.ftl
@@ -19,6 +19,15 @@
                 <li role="listitem"><a href="${siteMaintenance.recomputeInferences}" title="${i18n().recompute_inferences}">${i18n().recompute_inferences_mixed_caps}</a></li>
             </#if>
             
+            <#if siteMaintenance.startupStatus?has_content>
+                <li role="listitem">
+                    <a href="${siteMaintenance.startupStatus}" title="${i18n().startup_status}">${i18n().startup_status}</a>
+                    <#if siteMaintenance.startupStatusAlert>
+                        <img id="alertIcon" src="${urls.images}/iconAlert.png" width="20" height="20" alt="${i18n().error_alert_icon}" />
+                    </#if>
+                </li>
+            </#if>   
+            
             <#if siteMaintenance.restrictLogins?has_content>
                 <li role="listitem"><a href="${siteMaintenance.restrictLogins}" title="${i18n().restrict_logins}">${i18n().restrict_logins_mixed_caps}</a></li>
             </#if>