diff --git a/src/main/java/org/jlab/dtm/business/session/SystemFacade.java b/src/main/java/org/jlab/dtm/business/session/SystemFacade.java
index 90e0a0c..214a496 100644
--- a/src/main/java/org/jlab/dtm/business/session/SystemFacade.java
+++ b/src/main/java/org/jlab/dtm/business/session/SystemFacade.java
@@ -193,7 +193,7 @@ public SystemEntity findWithExpertList(BigInteger systemId) {
 
   @PermitAll
   public List<SystemEntity> findAllWithExpertList() {
-    List<SystemEntity> systemList = this.findAll(new OrderDirective("name"));
+    List<SystemEntity> systemList = this.findByComponentCategoryAndSystem(null, null, null, null);
 
     for (SystemEntity s : systemList) {
       JPAUtil.initialize(s.getSystemExpertList());
diff --git a/src/main/webapp/WEB-INF/views/setup/subsystem-expert.jsp b/src/main/webapp/WEB-INF/views/setup/subsystem-expert.jsp
index 566ad32..0a928d5 100644
--- a/src/main/webapp/WEB-INF/views/setup/subsystem-expert.jsp
+++ b/src/main/webapp/WEB-INF/views/setup/subsystem-expert.jsp
@@ -19,6 +19,10 @@
             #no-experts-defined {
                 margin-top: 1em;
             }
+            .warning{
+                color: red;
+                margin-bottom: 1em;
+            }
         </style>
     </jsp:attribute>
     <jsp:attribute name="scripts"> 
@@ -53,6 +57,9 @@
                         </s:filter-flyout-widget>
                         <h2 class="page-header-title"><c:out value="${title}"/></h2>
                         <div class="message-box"><c:out value="${selectionMessage}"/></div>
+                        <c:if test="${selectedSystem.archived}">
+                            <div class="warning">This system is archived!</div>
+                        </c:if>
                         <s:editable-row-table-controls excludeEdit="true"/>
                         <table id="expert-table" class="data-table stripped-table uniselect-table editable-row-table">
                             <thead>