Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r301b444dedf83e9caa28a69f3d70b84942181052 -r395688ee7ba729fee50566d7ef27348a3591404d
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 301b444dedf83e9caa28a69f3d70b84942181052)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 395688ee7ba729fee50566d7ef27348a3591404d)
@@ -131,7 +131,13 @@
 		<td>
 				<a href="userroles.do?userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.user.assign.roles"/></a>
 				&nbsp;
-				<a href="user.do?method=remove&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.user.delete"/></a>
+				<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
+					<a href="user.do?method=edit&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.edit" /></a>
+					&nbsp;
+				</logic:equal>
+				<logic:equal name="canDeleteUser" value="true">
+					<a href="user.do?method=remove&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.user.delete"/></a>
+				</logic:equal>
 				<br/>
 		</td>		
 	</tr>