Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -rbc541b33101290d0ef042e15b1a861a3ab4fb8b3 -rebf3cd425d492a39dcd1c67df54e1f86a376ace6
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bc541b33101290d0ef042e15b1a861a3ab4fb8b3)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
@@ -115,11 +115,12 @@
 label.spreadsheet = spreadsheet
 label.download.template = Download the template
 role.AUTHOR = Author
+role.AUTHOR.ADMIN = Author Admin
 role.GROUP.ADMIN = Group Admin
 role.GROUP.MANAGER = Group Manager
 role.LEARNER = Learner
 role.MONITOR = Monitor
-role.SYSADMIN = Sysadmin
+role.SYSADMIN = System Admin
 
 #==================== Organisation Management Screen ======================#
 admin.organisation.management = Group/Subgroup Management
@@ -139,6 +140,7 @@
 admin.class.manage = Manage Subgroups
 admin.class.add = Create New Subgroup
 admin.course.add = Create New Group
+admin.global.roles.manage = Manage Global Roles
 
 #======================== Management Screens =======================#
 admin.number = No.
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java
===================================================================
diff -u -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307 -rebf3cd425d492a39dcd1c67df54e1f86a376ace6
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java	(.../UserRolesAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java	(.../UserRolesAction.java)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
@@ -159,11 +159,20 @@
 		List<Role> allRoles = new ArrayList<Role>();
 		allRoles.addAll(rolelist);
 		Role role = new Role();
-		if(!isSysadmin) {
+		if(!orgType.getOrganisationTypeId().equals(OrganisationType.ROOT_TYPE) || !isSysadmin) {
 			role.setRoleId(Role.ROLE_SYSADMIN);
 			allRoles.remove(role);
+			role.setRoleId(Role.ROLE_AUTHOR_ADMIN);
+			allRoles.remove(role);
+		} else {
+			role.setRoleId(Role.ROLE_AUTHOR);
+			allRoles.remove(role);
+			role.setRoleId(Role.ROLE_LEARNER);
+			allRoles.remove(role);
+			role.setRoleId(Role.ROLE_MONITOR);
+			allRoles.remove(role);
 		}
-		if(orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) {
+		if(!orgType.getOrganisationTypeId().equals(OrganisationType.COURSE_TYPE)) {
 			role.setRoleId(Role.ROLE_COURSE_ADMIN);
 			allRoles.remove(role);
 			role.setRoleId(Role.ROLE_COURSE_MANAGER);
Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -rebf3cd425d492a39dcd1c67df54e1f86a376ace6
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
@@ -12,7 +12,10 @@
 			<c:param name="typeId" value="2" />
 			<c:param name="parentId" value="${OrgManageForm.parentId}" />
 		</c:url>
-		<p align="right"><input type="button" value='<fmt:message key="admin.course.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' /></p>
+		<p align="right">
+			<input type="button" value='<fmt:message key="admin.course.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' />
+			<input type="button" value='<fmt:message key="admin.global.roles.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+		</p>
 	</logic:equal>
 </logic:equal>
 <logic:equal name="OrgManageForm" property="type" value="2">
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -rebf3cd425d492a39dcd1c67df54e1f86a376ace6
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
@@ -4,16 +4,18 @@
 <h2 align="left">
 	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
 	<logic:equal name="orgType" value="1">
-		: <fmt:message key="admin.user.manage" />
+		: <fmt:message key="admin.global.roles.manage" />
 	</logic:equal>
 	<logic:equal name="orgType" value="2">
 		: <a href="orgmanage.do?org=<bean:write name="UserManageForm" property="orgId" />"><bean:write name="UserManageForm" property="orgName"/></a>
+		: <fmt:message key="admin.user.manage" />
 	</logic:equal>
 	<logic:equal name="orgType" value="3">
 		: <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
 		: <a href="usermanage.do?org=<bean:write name="UserManageForm" property="orgId" />"><bean:write name="UserManageForm" property="orgName"/></a>
+		: <fmt:message key="admin.user.manage" />
 	</logic:equal>
-	: <fmt:message key="admin.user.manage" />
+	
 </h2>
 
 <p>&nbsp;</p>
@@ -22,10 +24,10 @@
 	<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
 		<input type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit&orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 	</logic:equal>
+	<input type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 	<logic:notEqual name="UserManageForm" property="orgId" value="1">
-		<input type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
+		<input type="button" value='<fmt:message key="admin.edit" /> <bean:write name="UserManageForm" property="orgName"/>' onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${UserManageForm.orgId}"/>' />
 	</logic:notEqual>
-	<input type="button" value='<fmt:message key="admin.edit" /> <bean:write name="UserManageForm" property="orgName"/>' onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${UserManageForm.orgId}"/>' />
 </p>
 <table class="alternative-color" width=100%>
 <tr>
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -rebf3cd425d492a39dcd1c67df54e1f86a376ace6
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
@@ -15,8 +15,13 @@
     <logic:notEmpty name="pOrgId">
         : <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
     </logic:notEmpty>
-    : <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgForm" property="orgId" />">
+    <logic:notEqual name="UserOrgForm" property="orgId" value="1">
+		: <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgForm" property="orgId" />">
 		<bean:write name="UserOrgForm" property="orgName"/></a>
+	</logic:notEqual>
+	<logic:equal name="UserOrgForm" property="orgId" value="1">
+		: <a href="usermanage.do?org=<bean:write name="UserOrgForm" property="orgId" />"><fmt:message key="admin.global.roles.manage" /></a>
+	</logic:equal>
     : <fmt:message key="admin.user.add"/>
 </h2>
 
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -rebf3cd425d492a39dcd1c67df54e1f86a376ace6
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
@@ -13,8 +13,13 @@
     <logic:notEmpty name="pOrgId">
         : <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
     </logic:notEmpty>
-    : <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgRoleForm" property="orgId" />">
+    <logic:notEqual name="UserOrgRoleForm" property="orgId" value="1">
+		: <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgRoleForm" property="orgId" />">
 		<bean:write name="orgName"/></a>
+	</logic:notEqual>
+	<logic:equal name="UserOrgRoleForm" property="orgId" value="1">
+		: <a href="usermanage.do?org=<bean:write name="UserOrgRoleForm" property="orgId" />"><fmt:message key="admin.global.roles.manage" /></a>
+	</logic:equal>
 	: <fmt:message key="admin.user.assign.roles" />
 </h2>
 <p>&nbsp;</p>
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -rebf3cd425d492a39dcd1c67df54e1f86a376ace6
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
@@ -10,7 +10,12 @@
 		: <a href="usermanage.do?org=<bean:write name="UserRolesForm" property="orgId" />"><c:out value="${orgName}" /></a>
 	</logic:notEmpty>
 	<logic:empty name="pOrgId">
-		: <a href="orgmanage.do?org=<bean:write name="UserRolesForm" property="orgId" />"><c:out value="${orgName}" /></a>
+		<logic:notEqual name="UserRolesForm" property="orgId" value="1">
+			: <a href="orgmanage.do?org=<bean:write name="UserRolesForm" property="orgId" />"><c:out value="${orgName}" /></a>
+		</logic:notEqual>
+		<logic:equal name="UserRolesForm" property="orgId" value="1">
+			: <a href="usermanage.do?org=<bean:write name="UserRolesForm" property="orgId" />"><fmt:message key="admin.global.roles.manage" /></a>
+		</logic:equal>
 	</logic:empty>
 	: <fmt:message key="admin.user.assign.roles"/>
 </h2>