Index: lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java
===================================================================
diff -u -rfa1f5fe8a69c04b8d66a12c0c8d396cfcfb642cf -r23441c459973ebf00726e0f70e7b58c9a2d0074e
--- lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java	(.../SignupAction.java)	(revision fa1f5fe8a69c04b8d66a12c0c8d396cfcfb642cf)
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java	(.../SignupAction.java)	(revision 23441c459973ebf00726e0f70e7b58c9a2d0074e)
@@ -42,15 +42,13 @@
 
 	DynaActionForm signupForm = (DynaActionForm) form;
 	String method = WebUtil.readStrParam(request, "method", true);
-	if ((signupForm.get("submitted") == null) || !((Boolean) signupForm.get("submitted"))) {
-
-	    String context = WebUtil.readStrParam(request, "context", true);
+	String context = WebUtil.readStrParam(request, "context", true);
 	    SignupOrganisation signupOrganisation = null;
 	    if (StringUtils.isNotBlank(context)) {
 		signupOrganisation = SignupAction.signupService.getSignupOrganisation(context);
 		request.setAttribute("signupOrganisation", signupOrganisation);
 	    }
-
+	if ((signupForm.get("submitted") == null) || !((Boolean) signupForm.get("submitted"))) {
 	    if (signupOrganisation == null) {
 		request.setAttribute("messageKey", "No such signup page exists");
 		return mapping.findForward("message");
@@ -71,7 +69,7 @@
 	try {
 
 	    DynaActionForm signupForm = (DynaActionForm) form;
-
+	    
 	    // validation
 	    ActionMessages errors = validateSignup(signupForm);
 	    if (!errors.isEmpty()) {