Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r5a7b31fd5f98e009cd77634aa9b310e047a28716 -r22e9389aaada5dc91833d762a79f8051bca172c4
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 5a7b31fd5f98e009cd77634aa9b310e047a28716)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
@@ -25,17 +25,20 @@
 	<form-property name="name" type="java.lang.String" />
 	<form-property name="code" type="java.lang.String" />
 	<form-property name="description" type="java.lang.String" />
-	<form-property name="localeLanguage" type="java.lang.String" />
-	<form-property name="localeCountry" type="java.lang.String" />
+	<form-property name="localeId" type="java.lang.Byte" initial="1"/>
 	<form-property name="typeId" type="java.lang.Integer" />
 	<form-property name="stateId" type="java.lang.Integer" />
+	<form-property name="courseAdminCanAddNewUsers" type="java.lang.Boolean" initial="false"/>
+	<form-property name="courseAdminCanBrowseAllUsers" type="java.lang.Boolean" initial="false"/>
+	<form-property name="courseAdminCanChangeStatusOfCourse" type="java.lang.Boolean" initial="false"/>
 </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" />
 	<form-property name="login" type="java.lang.String" />
 	<form-property name="password" type="java.lang.String" />
+	<form-property name="password2" type="java.lang.String" />
 	<form-property name="title" type="java.lang.String" />
 	<form-property name="firstName" type="java.lang.String" />
 	<form-property name="lastName" type="java.lang.String" />
@@ -50,21 +53,22 @@
 	<form-property name="mobilePhone" type="java.lang.String" />
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
-	<form-property name="localeLanguage" type="java.lang.String" />
-	<form-property name="localeCountry" type="java.lang.String" />
-	<form-property name="learner" type="java.lang.String" />
-	<form-property name="author" type="java.lang.String" />
-	<form-property name="staff" type="java.lang.String" />
-	<form-property name="admin" type="java.lang.String" />
-	<form-property name="manager" 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">
+    <form-property name="orgId" type="java.lang.Integer" />
+    <form-property name="orgName" type="java.lang.String" />
+    <form-property name="userIds" type="java.lang.String[]" />
+</form-bean>
+
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
   <global-exceptions>
   <exception
-    handler="org.apache.struts.action.ExceptionHandler"
+    handler="org.lamsfoundation.lams.admin.web.StrutsExceptionHandler"
     key="error.system"
     path=".error"
     scope="request"
@@ -155,6 +159,21 @@
       />
     </action>
     <action
+      path="/userorgsave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
+      name="UserOrgForm"
+      scope="request"
+      input=".userorg"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/usersave"
       type="org.lamsfoundation.lams.admin.web.UserSaveAction"
       name="UserForm"
@@ -209,6 +228,20 @@
         redirect="false"
       />
     </action>
+    <action
+      path="/userorg"
+      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
+      name="UserOrgForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userorg"
+        path=".userorg"
+        redirect="false"
+      />
+    </action>
 
        <action
       path="/sysadminstart"