Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v
diff -u -r1.19 -r1.20
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	17 Jul 2006 05:04:46 -0000	1.19
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	17 Jul 2006 06:16:19 -0000	1.20
@@ -84,12 +84,15 @@
 		    request.setAttribute("org",orgId);
 		}
 		
+		request.setAttribute("canEdit",true);
 		// remove sysadmin from role list for non-sysadmin users
 		User requestor = (User)getService().getUserByLogin(request.getRemoteUser());
 		if(!getService().isUserInRole(requestor.getUserId(),getService().getRootOrganisation().getOrganisationId(),Role.SYSADMIN)){
 			Role sysadmin = new Role();
 			sysadmin.setRoleId(Role.ROLE_SYSADMIN);
 			allRoles.remove(sysadmin);
+			// set canEdit flag for non-sysadmin users
+			request.setAttribute("canEdit",false);
 		}
 		request.setAttribute("rolelist",allRoles);
 		request.setAttribute("locales",locales);
Index: lams_admin/web/user.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v
diff -u -r1.7 -r1.8
--- lams_admin/web/user.jsp	30 Jun 2006 01:58:38 -0000	1.7
+++ lams_admin/web/user.jsp	17 Jul 2006 06:16:16 -0000	1.8
@@ -25,7 +25,8 @@
 
 <div align="center"><html-el:errors/></div>
 <table>
-    <col align="right" /><col align="left" />
+  <col align="right" /><col align="left" />
+  <logic:equal name="canEdit" value="true">
 	<tr>
 		<td><fmt:message key="admin.user.login"/> *:</td>
 		<td><html-el:text property="login" size="20" maxlength="20" /></td>
@@ -109,7 +110,36 @@
 			</html-el:select>
 		</td>
 	</tr>
+  </logic:equal>
+  <logic:notEqual name="canEdit" value="true">
+    <tr>
+		<td><fmt:message key="admin.user.login"/>:</td>
+		<td><bean:write name="UserForm" property="login" /></td>
+	</tr>
 	<tr>
+	<td>Name:</td>
+		<td><bean:write name="UserForm" property="title" /> <bean:write name="UserForm" property="firstName" /> <bean:write name="UserForm" property="lastName" /></td>
+	</tr>
+	<html-el:hidden property="login" />
+	<html-el:hidden property="password" />
+	<html-el:hidden property="password2" />
+	<html-el:hidden property="title" />
+	<html-el:hidden property="firstName" />
+	<html-el:hidden property="lastName" />
+	<html-el:hidden property="addressLine1" />
+	<html-el:hidden property="addressLine2" />
+	<html-el:hidden property="addressLine3" />
+	<html-el:hidden property="city" />
+	<html-el:hidden property="state" />
+	<html-el:hidden property="country" />
+	<html-el:hidden property="dayPhone" />
+	<html-el:hidden property="eveningPhone" />
+	<html-el:hidden property="mobilePhone" />
+	<html-el:hidden property="fax" />
+	<html-el:hidden property="email" />
+	<html-el:hidden property="localeId" />
+  </logic:notEqual>
+	<tr>
 	    <td><fmt:message key="admin.user.roles"/>:</td>
 	    <td>
             <c:forEach items="${rolelist}" var="role">