Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rb5d493f6a41f8161b6a62a0cea53e78e069bac36
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision b5d493f6a41f8161b6a62a0cea53e78e069bac36)
@@ -171,8 +171,10 @@
 						    </small>
 						</td>
 						<td>
-								<a href="<lams:LAMSURL/>admin/userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.assign.roles"/></a>
-								&nbsp;
+								<c:if test="${userManageForm.canEditRole == true }">
+									<a href="<lams:LAMSURL/>admin/userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.assign.roles"/></a>
+									&nbsp;
+								</c:if>
 								<c:if test="${userManageForm.courseAdminCanAddNewUsers == true }">
 									<a href="<lams:LAMSURL/>admin/user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.edit" /></a>
 									&nbsp;