Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java
===================================================================
diff -u -r26a83b93c1ce8fa610895f50b57d44d6b7cc11db -r01c31091a1bc352d1149f67915d670a2101fbba2
--- lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java	(.../SignupController.java)	(revision 26a83b93c1ce8fa610895f50b57d44d6b7cc11db)
+++ lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java	(.../SignupController.java)	(revision 01c31091a1bc352d1149f67915d670a2101fbba2)
@@ -2,6 +2,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.Map;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.AddressException;
@@ -58,8 +59,6 @@
 	    return "msgContent";
 	}
 
-	request.setAttribute("countryCodes", LanguageUtil.getCountryCodes(true));
-
 	request.setAttribute("signupOrganisation", signupOrganisation);
 	return "signup/signup";
     }
@@ -70,7 +69,6 @@
 	    // validation
 	    MultiValueMap<String, String> errorMap = validateSignup(signupForm);
 	    if (!errorMap.isEmpty()) {
-		request.setAttribute("countryCodes", LanguageUtil.getCountryCodes(true));
 		request.setAttribute("errorMap", errorMap);
 		return "signup/signup";
 	    } else {
@@ -91,7 +89,6 @@
 
 		if (!ValidationUtil.isPasswordNotUserDetails(signupForm.getPassword(), user)) {
 		    errorMap.add("password", messageService.getMessage("label.password.restrictions"));
-		    request.setAttribute("countryCodes", LanguageUtil.getCountryCodes(true));
 		    request.setAttribute("errorMap", errorMap);
 		    return "signup/signup";
 		}
@@ -128,6 +125,11 @@
 	return "/";
     }
 
+    @ModelAttribute("countryCodes")
+    public Map<String, String> getCountryCodes() {
+	return LanguageUtil.getCountryCodes(true);
+    }
+
     private void sendWelcomeEmail(User user) throws AddressException, MessagingException, UnsupportedEncodingException {
 	String subject = messageService.getMessage("signup.email.welcome.subject");
 	String body = new StringBuilder(messageService.getMessage("signup.email.welcome.body.1")).append("<br /><br />")
@@ -173,6 +175,7 @@
 	    MultiValueMap<String, String> errorMap = validateSignin(signupForm);
 	    if (!errorMap.isEmpty()) {
 		request.setAttribute("errorMap", errorMap);
+		request.setAttribute("selectedTab", "login");
 		return "signup/signup";
 	    } else {
 		String login = signupForm.getUsernameTab2();
Index: lams_central/web/signup/signup.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r01c31091a1bc352d1149f67915d670a2101fbba2
--- lams_central/web/signup/signup.jsp	(.../signup.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/signup/signup.jsp	(.../signup.jsp)	(revision 01c31091a1bc352d1149f67915d670a2101fbba2)
@@ -16,10 +16,9 @@
 	<script type="text/javascript" src="/lams/includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript">
 		jQuery(document).ready(function(){
-			var selectedTab = (${(signupOrganisation != null) && signupOrganisation.loginTabActive}) ? 1 : 0;
-			$("#tabs").tabs({
-				selected: selectedTab
-			});
+			if (${selectedTab == 'login' || (signupOrganisation != null && signupOrganisation.loginTabActive)}){
+				$('#signupMenu #loginTab > a').tab('show');
+			}
 		});
 	</script>
 </lams:head>
@@ -68,10 +67,10 @@
 			<div class="col-md-12">
 				<div class="panel with-nav-tabs panel-default">
 					<div class="panel-heading" style="height: 51px">
-						<ul class="nav nav-tabs">
-							<li class="active"><a href="#tab1default" data-toggle="tab"><fmt:message
+						<ul id="signupMenu" class="nav nav-tabs">
+							<li id="signupTab" class="active"><a href="#tab1default" data-toggle="tab"><fmt:message
 										key="register.signup.to.lams" /></a></li>
-							<li><a href="#tab2default" data-toggle="tab"><fmt:message
+							<li id="loginTab"><a href="#tab2default" data-toggle="tab"><fmt:message
 										key="register.login" /></a></li>
 						</ul>
 					</div>