Index: lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java,v
diff -u -r1.6.2.5 -r1.6.2.6
--- lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java	20 Sep 2016 05:58:12 -0000	1.6.2.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java	22 Nov 2016 03:44:29 -0000	1.6.2.6
@@ -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()) {