Index: lams_admin/web/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userlist.jsp,v
diff -u -r1.28 -r1.29
--- lams_admin/web/userlist.jsp	4 Jan 2008 00:27:28 -0000	1.28
+++ lams_admin/web/userlist.jsp	29 Feb 2008 06:11:51 -0000	1.29
@@ -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>