Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -ra0a9327d7d5157b5fc508ddd2246ea7355e5f298 -r54ff12d78b5d617bc7767b37faea406d5675a746
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision a0a9327d7d5157b5fc508ddd2246ea7355e5f298)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 54ff12d78b5d617bc7767b37faea406d5675a746)
@@ -13,6 +13,12 @@
 	<form-property name="courseAdminCanChangeStatusOfCourse" type="java.lang.Boolean" initial="false"/>
 </form-bean>
 
+<form-bean name="UserRolesForm" type="org.apache.struts.action.DynaActionForm">
+    <form-property name="orgId" type="java.lang.Integer" />
+	<form-property name="userId" type="java.lang.Integer" />
+    <form-property name="roles" type="java.lang.String[]" />
+</form-bean>
+
 <form-bean name="UserForm" type="org.apache.struts.action.DynaActionForm">
     <form-property name="orgId" type="java.lang.Integer" />
 	<form-property name="userId" type="java.lang.Integer" />
@@ -35,7 +41,6 @@
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
 	<form-property name="localeId" type="java.lang.Byte" />
-    <form-property name="roles" type="java.lang.String[]" />
 </form-bean>
 
 <form-bean name="UserOrgForm" type="org.apache.struts.action.DynaActionForm">
@@ -45,10 +50,10 @@
 </form-bean>
 
 <form-bean name="UserSearchForm" type="org.apache.struts.action.DynaActionForm">
-	<form-property name="userId" type="java.lang.String" />
-    <form-property name="login" type="java.lang.String" />
-    <form-property name="firstName" type="java.lang.String" />
-    <form-property name="lastName" type="java.lang.String" />
+	<form-property name="sUserId" type="java.lang.String" />
+    <form-property name="sLogin" type="java.lang.String" />
+    <form-property name="sFirstName" type="java.lang.String" />
+    <form-property name="sLastName" type="java.lang.String" />
     <form-property name="searched" type="java.lang.Boolean" initial="false" />
 </form-bean>