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>