Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java
===================================================================
diff -u -r9cfe1aa20b4cc43c571bda0f090c1a2114e20261 -rda8739aacc8241083e733f4915dd3176a6d28ef0
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java	(.../ServerMaintainAction.java)	(revision 9cfe1aa20b4cc43c571bda0f090c1a2114e20261)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java	(.../ServerMaintainAction.java)	(revision da8739aacc8241083e733f4915dd3176a6d28ef0)
@@ -87,7 +87,9 @@
 			ExtServerOrgMap map = AdminServiceProxy.getIntegrationService(getServlet().getServletContext())
 				.getExtServerOrgMap(sid);
 			BeanUtils.copyProperties(serverOrgMapForm,map);
-			serverOrgMapForm.set("orgId", map.getOrganisation().getOrganisationId());
+			if (map.getOrganisation() != null) {
+				serverOrgMapForm.set("orgId", map.getOrganisation().getOrganisationId());
+			}
 		}
 		return mapping.findForward("servermaintain");
 	}
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
diff -u -r8fe3adcab07a1cc7fbc4fbaa0e9517a224055ec7 -rda8739aacc8241083e733f4915dd3176a6d28ef0
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 8fe3adcab07a1cc7fbc4fbaa0e9517a224055ec7)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision da8739aacc8241083e733f4915dd3176a6d28ef0)
@@ -204,9 +204,6 @@
 		map.setExtUsername(extUsername);
 		map.setUser(user);
 		service.save(map);
-		// every integration user is added to the group for their 3rd party server;
-		// becomes the 'public' folder for that server
-		addMemberships(user, serverMap.getOrganisation());
 		return map;
 	}
 	
@@ -246,9 +243,6 @@
 		map.setExtUsername(extUsername);
 		map.setUser(user);
 		service.save(map);
-		// every integration user is added to the group for their 3rd party server;
-		// becomes the 'public' folder for that server
-		addMemberships(user, serverMap.getOrganisation());
 		return map;
 		
 	}