Index: idea_project/.idea/misc.xml
===================================================================
diff -u -r5bc88174180046cd153cfc46a0c8ef13675bd4bf -r201b2a4bde67a04ad7cb2c38c916b0d3327e7d21
--- idea_project/.idea/misc.xml	(.../misc.xml)	(revision 5bc88174180046cd153cfc46a0c8ef13675bd4bf)
+++ idea_project/.idea/misc.xml	(.../misc.xml)	(revision 201b2a4bde67a04ad7cb2c38c916b0d3327e7d21)
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="javaeeApplication" url="file://$PROJECT_DIR$/../lams_build/assembly/lams.ear/META-INF/application.xml" />
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java
===================================================================
diff -u -r351f9417a32d396911387eeef3117fd40be35b7c -r201b2a4bde67a04ad7cb2c38c916b0d3327e7d21
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision 351f9417a32d396911387eeef3117fd40be35b7c)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision 201b2a4bde67a04ad7cb2c38c916b0d3327e7d21)
@@ -22,12 +22,6 @@
  */
 package org.lamsfoundation.lams.admin.web.controller;
 
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -54,6 +48,11 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+
 /**
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
@@ -121,13 +120,12 @@
 	    if (log.isDebugEnabled()) {
 		log.debug("orgId: " + org.getOrganisationId() + " create date: " + org.getCreateDate());
 	    }
-	    org = userManagementService.saveOrganisation(org, user.getUserID());
+	    userManagementService.saveOrganisation(org, user.getUserID());
 
-	    request.setAttribute("org", organisationForm.getParentId());
-	    return "forward:/orgmanage.do";
+	    return "redirect:/orgmanage.do?org=" + organisationForm.getParentId();
 	} else {
 	    request.setAttribute("errorMap", errorMap);
-	    return "forward:/organisation/edit.do";
+	    return "forward:/organisation/" + (orgId == null ? "create.do" : "edit.do");
 	}
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
===================================================================
diff -u -r1fb317e9f6db7094ec64f77782bf0be389012e43 -r201b2a4bde67a04ad7cb2c38c916b0d3327e7d21
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java	(.../OrganisationController.java)	(revision 1fb317e9f6db7094ec64f77782bf0be389012e43)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java	(.../OrganisationController.java)	(revision 201b2a4bde67a04ad7cb2c38c916b0d3327e7d21)
@@ -23,13 +23,6 @@
 
 package org.lamsfoundation.lams.admin.web.controller;
 
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.admin.web.form.OrganisationForm;
@@ -56,6 +49,12 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * @author Fei Yang
  */
@@ -133,9 +132,8 @@
 	if (!(request.isUserInRole(Role.APPADMIN) || request.isUserInRole(Role.SYSADMIN)
 		|| userManagementService.isUserGlobalGroupManager())) {
 	    // only appadmins and global group admins can create groups
-	    if (((organisationForm.getTypeId() != null)
-		    && organisationForm.getTypeId().equals(OrganisationType.COURSE_TYPE))
-		    || (organisationForm.getTypeId() == null)) {
+	    if (((organisationForm.getTypeId() != null) && organisationForm.getTypeId()
+		    .equals(OrganisationType.COURSE_TYPE)) || (organisationForm.getTypeId() == null)) {
 		return error(request);
 	    }
 	}
@@ -196,8 +194,8 @@
 	Integer organisationId = WebUtil.readIntParam(request, "orgId");
 	Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationId);
 	List<Long> lessonIDs = lessonService.getOrganisationLessons(organisationId);
-	StringBuilder logMessageBuilder = new StringBuilder("removed permanently lessons in organisation \"")
-		.append(organisation.getName()).append("\": ");
+	StringBuilder logMessageBuilder = new StringBuilder("removed permanently lessons in organisation \"").append(
+		organisation.getName()).append("\": ");
 	for (Long lessonId : lessonIDs) {
 	    Lesson lesson = lessonService.getLesson(lessonId);
 	    logMessageBuilder.append("\"").append(lesson.getLessonName()).append("\" (").append(lessonId)
@@ -226,7 +224,7 @@
     public String error(HttpServletRequest request) {
 	request.setAttribute("errorName", "OrganisationAction");
 	request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
-	return "error";
+	return "/error";
     }
 
     private Integer getUserID() {
@@ -241,4 +239,4 @@
 	    status = userManagementService.findAll(OrganisationState.class);
 	}
     }
-}
+}
\ No newline at end of file