Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
===================================================================
diff -u -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307 -r2790fd36d08560877571dd8f169545a1559f6e54
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 2790fd36d08560877571dd8f169545a1559f6e54)
@@ -72,7 +72,7 @@
  *                scope="request"
  *                validate="false"
  *
- * @struts:action-forward name="organisation" path=".organisation"                
+ * @struts:action-forward name="organisation" path="/organisation.do?method=edit"                
  * @struts:action-forward name="orglist" path="/orgmanage.do"
  * @struts:action-forward name="userlist" path="/usermanage.do"
  */
@@ -135,7 +135,13 @@
 			return mapping.findForward("orglist");
 		}else{
 			saveErrors(request,errors);
-			return mapping.findForward("organisation");
+			ActionForward forward = mapping.findForward("organisation");
+			if(orgId!=0) {
+				return forward;
+			}else{
+				forward.setPath(forward.getPath()+"&orgId="+orgId);
+				return forward;
+			}
 		}
 	}