Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java,v
diff -u -r1.1 -r1.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java	2 Aug 2012 14:07:45 -0000	1.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java	2 Aug 2012 15:05:55 -0000	1.2
@@ -54,14 +54,14 @@
 
 	    String method = WebUtil.readStrParam(request, "method", true);
 
-	    if (StringUtils.equals(method, "edit")) {
+	    if (StringUtils.equals(method, "list") || isCancelled(request)) {
+		// do nothing
+	    } else if (StringUtils.equals(method, "edit")) {
 		return edit(mapping, form, request, response);
 	    } else if (StringUtils.equals(method, "add")) {
 		return add(mapping, form, request, response);
 	    } else if (StringUtils.equals(method, "delete")) {
 		return delete(mapping, form, request, response);
-	    } else if (StringUtils.equals(method, "list")) {
-		// do nothing
 	    }
 
 	    List signupOrganisations = signupService.getSignupOrganisations();
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/signupmanagement/add.jsp,v
diff -u -r1.1 -r1.2
--- lams_admin/web/signupmanagement/add.jsp	2 Aug 2012 14:07:45 -0000	1.1
+++ lams_admin/web/signupmanagement/add.jsp	2 Aug 2012 15:05:55 -0000	1.2
@@ -13,7 +13,7 @@
 	
 	<table>
 		<tr>
-			<td><fmt:message key="admin.group" />:</td>
+			<td style="width: 250px;"><fmt:message key="admin.group" />:</td>
 			<td>
 				<html:select property="organisationId">
 					<c:forEach items="${organisations}" var="organisation">
@@ -59,8 +59,12 @@
 			<td><html:errors property="context" /></td>
 		</tr>
 		<tr>
-			<td align="right"><html:submit styleClass="button"><fmt:message key="admin.submit" /></html:submit></td>
 			<td></td>
+			<td style="padding-left: 80px;">
+				<html:submit styleClass="button"><fmt:message key="admin.submit" /></html:submit>
+				<html:cancel styleClass="button"><fmt:message key="admin.cancel" /></html:cancel>
+			</td>
+			<td></td>
 		</tr>
 	</table>
 
Index: lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java	2 Aug 2012 14:07:47 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java	2 Aug 2012 15:13:32 -0000	1.2
@@ -41,7 +41,7 @@
     }
 
     /**
-     * @hibernate.many-to-one not-null="true" cascade="all-delete-orphan" lazy="false"
+     * @hibernate.many-to-one not-null="true" cascade="delete" lazy="false"
      * @hibernate.column name="organisation_id"
      */
     public Organisation getOrganisation() {