Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.15 -r1.16
--- lams_central/conf/language/lams/ApplicationResources.properties	4 Dec 2007 04:00:39 -0000	1.15
+++ lams_central/conf/language/lams/ApplicationResources.properties	6 Dec 2007 01:59:01 -0000	1.16
@@ -188,6 +188,7 @@
 msg.import.file.format  =The import file must be a .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2.
 label.enable.lesson.sorting  =enable lesson sorting
 label.lesson.sorting.enabled  =lesson sorting enabled
+label.show.groups = Show Groups
 
 
 #======= End labels: Exported 182 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.15 -r1.16
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	4 Dec 2007 04:00:39 -0000	1.15
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	6 Dec 2007 01:59:01 -0000	1.16
@@ -188,6 +188,7 @@
 msg.import.file.format  =The import file must be a .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2.
 label.enable.lesson.sorting  =enable lesson sorting
 label.lesson.sorting.enabled  =lesson sorting enabled
+label.show.groups = Show Groups
 
 
 #======= End labels: Exported 182 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.40 -r1.41
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	12 Nov 2007 23:30:46 -0000	1.40
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	6 Dec 2007 01:59:01 -0000	1.41
@@ -108,6 +108,15 @@
 			return mapping.findForward("community");
 		}
 		
+		if (request.isUserInRole(Role.SYSADMIN)) {
+			// don't load group ids for sysadmins, unless 'groups' parameter is set
+			String groups = WebUtil.readStrParam(request, "groups", true);
+			if (StringUtils.isBlank(groups)) {
+				request.setAttribute("showGroups", false);
+				return mapping.findForward("main");
+			}
+		}
+		
 		List collapsedOrgDTOs = getService().getActiveCourseIdsByUser(loggedInUser.getUserId(), request.isUserInRole(Role.SYSADMIN));
 		request.setAttribute("collapsedOrgDTOs", collapsedOrgDTOs);
 		
Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.29 -r1.30
--- lams_central/web/main.jsp	28 Nov 2007 01:30:22 -0000	1.29
+++ lams_central/web/main.jsp	6 Dec 2007 01:59:01 -0000	1.30
@@ -147,7 +147,14 @@
 									</div>
 								</c:forEach>
 								<c:if test="${empty collapsedOrgDTOs}">
-									<p class="align-left"><fmt:message key="msg.groups.empty" /></p>
+									<c:if test="${not empty showGroups}">
+										<div align="center" style="padding:30px;">
+											<a onclick="document.location.href='index.do?groups=show';"><fmt:message key="label.show.groups"/></a>
+										</div>
+									</c:if>
+									<c:if test="${empty showGroups}">
+										<p class="align-left"><fmt:message key="msg.groups.empty" /></p>
+									</c:if>
 								</c:if>
 							</c:if>
 							<c:if test="${tab eq 'profile'}">