Index: lams_common/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r72ae153ff9010e4d81f1420bc4a72668d3cf4b1e -r15c38aa57f9b74cc1e7cc1223494edba207ebf51
--- lams_common/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 72ae153ff9010e4d81f1420bc4a72668d3cf4b1e)
+++ lams_common/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 15c38aa57f9b74cc1e7cc1223494edba207ebf51)
@@ -15,7 +15,11 @@
 	
     <form-bean name="PasswordChangeActionForm"
                type="com.lamsinternational.lams.web.PasswordChangeActionForm" />
+    
+    <form-bean name="OrganisationActionForm"
+               type="com.lamsinternational.lams.usermanagement.web.OrganisationActionForm" />
                
+               
 	</form-beans>
 	<!-- ========== Global Exceptions Definitions =================================== -->
 	<!--
@@ -38,11 +42,8 @@
     <action path="/home"
             type="com.lamsinternational.lams.web.HomeAction"
             parameter="method">
-      <forward name="sysadmin"
-               path=".admin.sysadmin">
-      </forward>
       <forward name="admin"
-               path="/admin.jsp">
+               path=".admin">
       </forward>
       <forward name="staff"
                path="/staff.jsp">
@@ -64,9 +65,26 @@
       <forward name="organisation"
                path=".admin.organisation">
       </forward>
+      <forward name="error"
+               path=".admin.error">
+      </forward>
 	</action>
 
+    <action path="/organisation"
+            type="com.lamsinternational.lams.usermanagement.web.OrganisationAction"
+            name="OrganisationActionForm"
+            scope="session"
+            input=".admin.organisation"
+            validate="true">
+      <forward name="admin"
+               path=".admin">
+      </forward>
+      <forward name="error"
+               path=".admin.error">
+      </forward>
+	</action>
 
+
     <action path="/passwordChanged"
             type="com.lamsinternational.lams.web.PasswordChangeAction"
             name="PasswordChangeActionForm"