Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r440554bb4a9a414c6e3e676a93de72de3298951c -rbbe03f066072283259be9533216ab1a24c1dd5c9
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 440554bb4a9a414c6e3e676a93de72de3298951c)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision bbe03f066072283259be9533216ab1a24c1dd5c9)
@@ -247,7 +247,7 @@
 				return mapping.findForward("error");
 			} else { 
 				Integer orgId = classId != null ? classId : courseId;
-				if (isUserInRole(user.getUserID(), orgId, Role.STAFF) || isUserInRole(user.getUserID(), orgId, Role.TEACHER)) {
+				if (isUserInRole(user.getUserID(), orgId, Role.STAFF)) {
 					log.debug("user is staff");
 					String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
 					req.setAttribute("serverUrl", serverUrl);
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
===================================================================
diff -u -rff6228b576d4e7056c01ba7d7d8a109a5b738838 -rbbe03f066072283259be9533216ab1a24c1dd5c9
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision ff6228b576d4e7056c01ba7d7d8a109a5b738838)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision bbe03f066072283259be9533216ab1a24c1dd5c9)
@@ -1219,7 +1219,7 @@
 		while (roleIterator.hasNext()) {
 			UserOrganisationRole userOrganisationRole = (UserOrganisationRole) roleIterator.next();
 			Role role = userOrganisationRole.getRole();
-			if (role.isAuthor() || role.isStaff() || role.isTeacher())
+			if (role.isAuthor() || role.isSysAdmin() || role.isCourseManager())
 				return true;
 		}
 		return false;