Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5835d5dd250ed2c1e670627ff0a6a20339e7236f -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5835d5dd250ed2c1e670627ff0a6a20339e7236f)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf)
@@ -489,6 +489,7 @@
 admin.confirm.course.key  =Confirm course key
 admin.description.txt  =Description
 admin.disable.option  =Disabled?
+admin.login.tab  =Show login tab as active?
 admin.context.path  =Path to sign up
 admin.submit  =Submit
 admin.actions  =Actions
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r2b88dada3266a4b0f83f4b5c4cf617553496ca59 -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 2b88dada3266a4b0f83f4b5c4cf617553496ca59)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf)
@@ -119,5 +119,6 @@
 	<form-property name="confirmCourseKey" type="java.lang.String" />
 	<form-property name="blurb" type="java.lang.String" />
 	<form-property name="disabled" type="java.lang.Boolean" initial="0" />
+	<form-property name="loginTabActive" type="java.lang.Boolean" initial="0" />
 	<form-property name="context" type="java.lang.String" />
 </form-bean>
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java
===================================================================
diff -u -rca3bcf053bba34c776653e5a3a3a9560ec30915f -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java	(.../SignupManagementAction.java)	(revision ca3bcf053bba34c776653e5a3a3a9560ec30915f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java	(.../SignupManagementAction.java)	(revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf)
@@ -93,6 +93,7 @@
 		signupForm.set("courseKey", signup.getCourseKey());
 		signupForm.set("blurb", signup.getBlurb());
 		signupForm.set("disabled", signup.getDisabled());
+		signupForm.set("loginTabActive", signup.getLoginTabActive());
 		signupForm.set("context", signup.getContext());
 
 		List organisations = signupService.getOrganisationCandidates();
@@ -141,6 +142,7 @@
 		signup.setAddWithAuthor((Boolean) signupForm.get("addWithAuthor"));
 		signup.setAddWithMonitor((Boolean) signupForm.get("addWithMonitor"));
 		signup.setDisabled((Boolean) signupForm.get("disabled"));
+		signup.setLoginTabActive((Boolean) signupForm.get("loginTabActive"));
 		signup.setOrganisation((Organisation) userManagementService.findById(Organisation.class,
 			(Integer) signupForm.get("organisationId")));
 		signup.setCourseKey(signupForm.getString("courseKey"));
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
diff -u -r8cb77d2984b9927bf669a836b18a9969f8e39614 -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 8cb77d2984b9927bf669a836b18a9969f8e39614)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf)
@@ -54,6 +54,11 @@
 			<td></td>
 		</tr>
 		<tr>
+			<td><fmt:message key="admin.login.tab" />:</td>
+			<td><html:checkbox property="loginTabActive" /></td>
+			<td></td>
+		</tr>		
+		<tr>
 			<td><fmt:message key="admin.context.path" />:</td>
 			<td style="vertical-align: middle;"><lams:LAMSURL/>signup/<html:text property="context" /></td>
 			<td><html:errors property="context" /></td>
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r5a5f3640c4d5fdf0c302347e7d6b502a972fd9cc -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java
===================================================================
diff -u -r2b88dada3266a4b0f83f4b5c4cf617553496ca59 -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf
--- lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java	(.../SignupAction.java)	(revision 2b88dada3266a4b0f83f4b5c4cf617553496ca59)
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java	(.../SignupAction.java)	(revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf)
@@ -56,11 +56,6 @@
 	    SignupOrganisation signupOrganisation = signupService.getSignupOrganisation(context);
 	    request.setAttribute("signupOrganisation", signupOrganisation);
 	}
-	
-	String selectedTab = WebUtil.readStrParam(request, "selectedTab", true);
-	if (StringUtils.isNotBlank(selectedTab)) {
-	   request.setAttribute("selectedTab", selectedTab);
-	}
 
 	DynaActionForm signupForm = (DynaActionForm) form;
 	String method = WebUtil.readStrParam(request, "method", true);
Index: lams_central/web/signup/signup.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf
--- lams_central/web/signup/signup.jsp	(.../signup.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_central/web/signup/signup.jsp	(.../signup.jsp)	(revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf)
@@ -22,17 +22,12 @@
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 <script language="JavaScript" type="text/javascript">
-	<!--
-		jQuery(document).ready(function(){
-			var selectedTab = ('${param.selectedTab}' == '') ? 1 : '${param.selectedTab}';
-			$("#tabs").tabs({
-				selected: selectedTab
-			});
+	jQuery(document).ready(function(){
+		var selectedTab = (${(signupOrganisation != null) && signupOrganisation.loginTabActive}) ? 1 : 0;
+		$("#tabs").tabs({
+			selected: selectedTab
 		});
-		function selectSignupTab() {
-			$("#tabs").tabs( "select" , 0 );
-		}
-	//-->
+	});
 </script>
 
 <h1 align="center">
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml
===================================================================
diff -u -r2b88dada3266a4b0f83f4b5c4cf617553496ca59 -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml	(.../SignupOrganisation.hbm.xml)	(revision 2b88dada3266a4b0f83f4b5c4cf617553496ca59)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml	(.../SignupOrganisation.hbm.xml)	(revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf)
@@ -111,6 +111,15 @@
             column="disabled"
             length="1"
         />
+        
+        <property
+            name="loginTabActive"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="login_tab_active"
+            length="1"
+        />
 
         <property
             name="context"
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040015.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040015.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040015.sql	(revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf)
@@ -0,0 +1,12 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+
+-- 	LDEV-2986 Allow choosing which tab is active on a signup page
+ALTER TABLE lams_signup_organisation ADD COLUMN login_tab_active TINYINT(1) DEFAULT 0; 
+
+-- If there were no errors, commit and restore autocommit to on
+SET FOREIGN_KEY_CHECKS=0;
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java
===================================================================
diff -u -rafcc8e2197603d94c2c476def4b6dd601951b84b -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf
--- lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java	(.../SignupOrganisation.java)	(revision afcc8e2197603d94c2c476def4b6dd601951b84b)
+++ lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java	(.../SignupOrganisation.java)	(revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf)
@@ -5,12 +5,12 @@
 import org.lamsfoundation.lams.usermanagement.Organisation;
 
 /**
- * SignupOrganisation. 
- * 
- * @hibernate.class table="lams_signup_organisation"
+ * Signup organisation. 
  */
 public class SignupOrganisation {
     
+    //There is no XDoclet annotations as it can't produce lazy="false" for Organisation
+    
     /**
      * Link on Lams wiki signup help page.
      */
@@ -27,11 +27,9 @@
     private String blurb;
     private Date createDate;
     private Boolean disabled;
+    private Boolean loginTabActive;
     private String context;
 
-    /**
-     * @hibernate.id generator-class="native" type="java.lang.Integer" column="signup_organisation_id"
-     */
     public Integer getSignupOrganisationId() {
 	return signupOrganisationId;
     }
@@ -40,10 +38,6 @@
 	this.signupOrganisationId = signupOrganisationId;
     }
 
-    /**
-     * @hibernate.many-to-one not-null="true" cascade="delete" lazy="false"
-     * @hibernate.column name="organisation_id"
-     */
     public Organisation getOrganisation() {
 	return organisation;
     }
@@ -52,9 +46,6 @@
 	this.organisation = organisation;
     }
 
-    /**
-     * @hibernate.property column="add_to_lessons" length="1"
-     */
     public Boolean getAddToLessons() {
 	return addToLessons;
     }
@@ -63,9 +54,6 @@
 	this.addToLessons = addToLessons;
     }
 
-    /**
-     * @hibernate.property column="add_as_staff" length="1"
-     */
     public Boolean getAddAsStaff() {
 	return addAsStaff;
     }
@@ -74,9 +62,6 @@
 	this.addAsStaff = addAsStaff;
     }
 
-    /**
-     * @hibernate.property column="add_with_author" length="1"
-     */
     public Boolean getAddWithAuthor() {
         return addWithAuthor;
     }
@@ -85,9 +70,6 @@
         this.addWithAuthor = addWithAuthor;
     }
 
-    /**
-     * @hibernate.property column="add_with_monitor" length="1"
-     */
     public Boolean getAddWithMonitor() {
         return addWithMonitor;
     }
@@ -96,9 +78,6 @@
         this.addWithMonitor = addWithMonitor;
     }
 
-    /**
-     * @hibernate.property column="course_key" length="255"
-     */
     public String getCourseKey() {
 	return courseKey;
     }
@@ -107,9 +86,6 @@
 	this.courseKey = courseKey;
     }
 
-    /**
-     * @hibernate.property column="blurb" length="2147483647"
-     */
     public String getBlurb() {
 	return blurb;
     }
@@ -118,9 +94,6 @@
 	this.blurb = blurb;
     }
 
-    /**
-     * @hibernate.property column="create_date" length="19" not-null="true"
-     */
     public Date getCreateDate() {
 	return createDate;
     }
@@ -129,20 +102,22 @@
 	this.createDate = createDate;
     }
 
-    /**
-     * @hibernate.property column="disabled" length="1"
-     */
     public Boolean getDisabled() {
 	return disabled;
     }
 
     public void setDisabled(Boolean disabled) {
 	this.disabled = disabled;
     }
+    
+    public Boolean getLoginTabActive() {
+	return loginTabActive;
+    }
 
-    /**
-     * @hibernate.property column="context" length="255"
-     */
+    public void setLoginTabActive(Boolean loginTabActive) {
+	this.loginTabActive = loginTabActive;
+    }
+
     public String getContext() {
         return context;
     }