Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java
===================================================================
diff -u -r622101803252450b96cc9882a17ae20de4f6e431 -r9cfe1aa20b4cc43c571bda0f090c1a2114e20261
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java	(.../ServerMaintainAction.java)	(revision 622101803252450b96cc9882a17ae20de4f6e431)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java	(.../ServerMaintainAction.java)	(revision 9cfe1aa20b4cc43c571bda0f090c1a2114e20261)
@@ -39,14 +39,11 @@
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.integration.ExtServerOrgMap;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
-import org.lamsfoundation.lams.integration.service.IntegrationService;
 import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * <p>
@@ -70,8 +67,8 @@
             HttpServletRequest request,
             HttpServletResponse response) throws Exception{
 		Map<String,Object> properties = new HashMap<String,Object>();
-		properties.put("organisationType.organisationTypeId", 1);
-		properties.put("organisationState.organisationStateId", 1);
+		properties.put("organisationType.organisationTypeId", OrganisationType.COURSE_TYPE);
+		properties.put("organisationState.organisationStateId", OrganisationState.ACTIVE);
 		List<Organisation> list = AdminServiceProxy.getService(getServlet().getServletContext())
 			.findByProperties(Organisation.class, properties);
 		Organisation dummy = new Organisation();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java
===================================================================
diff -u -r622101803252450b96cc9882a17ae20de4f6e431 -r9cfe1aa20b4cc43c571bda0f090c1a2114e20261
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision 622101803252450b96cc9882a17ae20de4f6e431)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision 9cfe1aa20b4cc43c571bda0f090c1a2114e20261)
@@ -104,7 +104,7 @@
 				org = new Organisation();
 				org.setName(orgName);
 				org.setParentOrganisation(userService.getRootOrganisation());
-				org.setOrganisationType((OrganisationType)userService.findById(OrganisationType.class,OrganisationType.ROOT_TYPE));
+				org.setOrganisationType((OrganisationType)userService.findById(OrganisationType.class,OrganisationType.COURSE_TYPE));
 				org.setOrganisationState((OrganisationState)userService.findById(OrganisationState.class,OrganisationState.ACTIVE));
 				String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE);
 				SupportedLocale locale = userService.getSupportedLocale(defaultLocale.substring(0,2),defaultLocale.substring(3));
@@ -156,8 +156,8 @@
 		} else {
 			saveErrors(request, errors);
 			Map<String,Object> properties = new HashMap<String,Object>();
-			properties.put("organisationType.organisationTypeId", 1);
-			properties.put("organisationState.organisationStateId", 1);
+			properties.put("organisationType.organisationTypeId", OrganisationType.COURSE_TYPE);
+			properties.put("organisationState.organisationStateId", OrganisationState.ACTIVE);
 			List list = userService.findByProperties(Organisation.class, properties);
 			Organisation dummy = new Organisation();
 			dummy.setOrganisationId(-1);