Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
===================================================================
diff -u -r2790fd36d08560877571dd8f169545a1559f6e54 -r1350f430376f5ac5788f66e03d5207d4119384bd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 2790fd36d08560877571dd8f169545a1559f6e54)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 1350f430376f5ac5788f66e03d5207d4119384bd)
@@ -135,13 +135,7 @@
 			return mapping.findForward("orglist");
 		}else{
 			saveErrors(request,errors);
-			ActionForward forward = mapping.findForward("organisation");
-			if(orgId!=0) {
-				return forward;
-			}else{
-				forward.setPath(forward.getPath()+"&orgId="+orgId);
-				return forward;
-			}
+			return mapping.findForward("organisation");
 		}
 	}
 	
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
===================================================================
diff -u -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307 -r1350f430376f5ac5788f66e03d5207d4119384bd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision 1350f430376f5ac5788f66e03d5207d4119384bd)
@@ -91,6 +91,7 @@
 			return mapping.findForward("error");
 		} else {
 			// creating new organisation
+			orgForm.set("orgId", null);
 			Integer parentId = WebUtil.readIntParam(request,"parentId",true);
 			if (parentId!=null) {
 				Organisation parentOrg = (Organisation)service.findById(Organisation.class,parentId);