Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r3c3ff3f2bd9e05d38823db2f4932217953acf160 -rf30bbddfb24ca43e7a57fc79f8628b67911df505
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 3c3ff3f2bd9e05d38823db2f4932217953acf160)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision f30bbddfb24ca43e7a57fc79f8628b67911df505)
@@ -226,7 +226,12 @@
 		</property>
 		<property name="transactionAttributes">
 			<props>
-				<prop key="signupUser">PROPAGATION_REQUIRED</prop>
+				<prop key="sign*">PROPAGATION_REQUIRED</prop>
+				<prop key="contextExists">PROPAGATION_REQUIRED</prop>
+				<prop key="courseKeyIsValid">PROPAGATION_REQUIRED</prop>
+				<prop key="emailVerify">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="usernameExists">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
Index: lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java
===================================================================
diff -u -re952488de6475350bc2fab3272b5350b3a7a6d51 -rf30bbddfb24ca43e7a57fc79f8628b67911df505
--- lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision e952488de6475350bc2fab3272b5350b3a7a6d51)
+++ lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision f30bbddfb24ca43e7a57fc79f8628b67911df505)
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
+import org.hibernate.Hibernate;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.signup.dao.ISignupDAO;
@@ -43,7 +44,7 @@
 	// add to org
 	SignupOrganisation signup = signupDAO.getSignupOrganisation(context);
 
-	ArrayList<String> rolesList = new ArrayList<String>();
+	ArrayList<String> rolesList = new ArrayList<>();
 	rolesList.add(Role.ROLE_LEARNER.toString());
 	if (signup.getAddAsStaff()) {
 	    rolesList.add(Role.ROLE_MONITOR.toString());
@@ -80,7 +81,7 @@
 	// add to org
 	SignupOrganisation signup = signupDAO.getSignupOrganisation(context);
 
-	ArrayList<String> rolesList = new ArrayList<String>();
+	ArrayList<String> rolesList = new ArrayList<>();
 	rolesList.add(Role.ROLE_LEARNER.toString());
 	if (signup.getAddAsStaff()) {
 	    rolesList.add(Role.ROLE_MONITOR.toString());
@@ -115,7 +116,10 @@
 
     @Override
     public SignupOrganisation getSignupOrganisation(String context) {
-	return signupDAO.getSignupOrganisation(context);
+	SignupOrganisation result = signupDAO.getSignupOrganisation(context);
+	// initialize lazy-loaded organisation here, so it can be used in JSP produced by SignupController#execute()
+	Hibernate.initialize(result.getOrganisation());
+	return result;
     }
 
     @Override
@@ -198,7 +202,7 @@
     private SupportedLocale getSupportedLocaleOrNull(String langIsoCode, String countryIsoCode) {
 	SupportedLocale locale = null;
 
-	Map<String, Object> properties = new HashMap<String, Object>();
+	Map<String, Object> properties = new HashMap<>();
 
 	if (StringUtils.isNotBlank(countryIsoCode)) {
 	    properties.put("countryIsoCode", countryIsoCode.trim());