diff --git a/src/main/java/org/olat/registration/RegistrationManager.java b/src/main/java/org/olat/registration/RegistrationManager.java
index 99b5aae43c45b9d03fa6a6361b550194b2603ef9..8a3cd0d095f03108321b4fbcc42b8e231c43f218 100644
--- a/src/main/java/org/olat/registration/RegistrationManager.java
+++ b/src/main/java/org/olat/registration/RegistrationManager.java
@@ -73,8 +73,10 @@ public class RegistrationManager extends BasicManager {
 	private RegistrationModule registrationModule;
 	private MailManager mailManager;
 	private BaseSecurity securityManager;
+	private static RegistrationManager INSTANCE;
 
 	private RegistrationManager() {
+		INSTANCE = this;
 		// singleton
 	}
 
@@ -82,7 +84,7 @@ public class RegistrationManager extends BasicManager {
 	 * @return Manager instance.
 	 */
 	public static RegistrationManager getInstance() {
-		return new RegistrationManager();
+		return INSTANCE;
 	}
 	
 	/**
diff --git a/src/main/java/org/olat/shibboleth/_content/shibbolethlogin.html b/src/main/java/org/olat/shibboleth/_content/shibbolethlogin.html
index 64c8c2aecc05fff2987e09f7cf3b8408f5e6f632..62d61ae187d540a2ca28d11e8d8b6e50061c1078 100644
--- a/src/main/java/org/olat/shibboleth/_content/shibbolethlogin.html
+++ b/src/main/java/org/olat/shibboleth/_content/shibbolethlogin.html
@@ -166,7 +166,11 @@ wayf_additional_idps = [$additionalIDPs];
 function o_overrideShibSubmitButtonStyle() {
        jQuery( function() {              
                try {
-                       jQuery('#wayf_submit_button').addClass('btn btn-primary').css('float','left');
+            	   	   // add bootstrap styling to wayf pulldown
+                       jQuery('#wayf_submit_button').addClass('btn btn-primary o_small').css('float','left');
+   					   jQuery("#user_idp").addClass("form-control");
+					   jQuery("#wayf_div").width("auto").css({backgroundColor: 'transparent', border: 0, padding: 0});
+                       // make submit button durty when idp is selected
                        jQuery('#user_idp').on('change',function(){ jQuery('#wayf_submit_button').addClass('o_button_dirty')});
                } catch (e) {
                        // ignore, only style, not important