diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
index 3923f4c3466..8519009bf05 100644
--- a/src/main/webapp/loginpage.xhtml
+++ b/src/main/webapp/loginpage.xhtml
@@ -200,13 +200,13 @@
                             
                             <div id="otherProviders" jsf:rendered="#{LoginPage.listAuthenticationProviders().size() > 1}">
                                 <h4>#{bundle['auth.providers.title']}</h4>
-                                <ui:repeat value="#{LoginPage.listAuthenticationProviders()}" var="provider">
-                                    <h:form>
+                                <h:form>
+                                    <ui:repeat value="#{LoginPage.listAuthenticationProviders()}" var="provider">
                                         <p:commandLink rendered="#{provider.id != LoginPage.authProvider.id}" styleClass="btn btn-default" actionListener="#{LoginPage.setAuthProviderById(provider.id)}" update="login-container">
                                             <h:outputText value="#{provider.title}" />
                                         </p:commandLink>
-                                    </h:form>
-                                </ui:repeat>
+                                    </ui:repeat>
+                                </h:form>
                             </div>
                         </div>
                     </div>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 25993b1396c..12459b9730c 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -232,7 +232,7 @@ body.widget-view #dataverse-header-block {padding-top:0px;}
 div.panel.highlight {
     background-color: #f7f7f9;
 }
-#otherProviders a.btn.btn-default {margin-right:1em; margin-bottom:1em;}
+#otherProviders a.ui-commandlink.ui-widget {margin-right:1em; margin-bottom:1em;}
 #idpSelectIdPListTile form, #idpSelectIdPEntryTile form {margin-bottom:1em;}
 #idpSelectIdPListTile input.btn, #idpSelectIdPEntryTile input.btn {margin-left:.5em;}
 #idpSelectIdPEntryTile {position: relative;}