diff --git a/index.html b/index.html
index 8280767..a6d01cd 100644
--- a/index.html
+++ b/index.html
@@ -87,13 +87,13 @@ <h2 class="well-small">Sign in</h2>
 
 <script type="text/html" id="tmpl-button">
     <div class="span3">
-		<a class="btn btn-large btn-primary">
-			<% if (image) { %>
-			<div><img src="<%=image%>"></div>
+		<a class="btn btn-large<%= (last_issuer == button.issuer) ? " btn-primary" : ""%>">
+			<% if (button.image) { %>
+			<div><img src="<%=button.image%>"></div>
 			<% } %>
 			<div>
 				<i class="icon-user icon-white"></i>
-    	    	Sign in with <%=descriptor%>
+    	    	Sign in with <%=button.descriptor%>
 			</div>
 		</a>
 
diff --git a/resources/js/app.js b/resources/js/app.js
index f7f0c99..e95d0c4 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -43,7 +43,7 @@ $(function () {
     $.each(OIDCproviders, function (key, button) {
 
         // build a button and append it
-        var $buttonEl = $(button_tmpl(button)).appendTo('#button-container');
+        var $buttonEl = $(button_tmpl({button: button, last_issuer: last_issuer})).appendTo('#button-container');
 
         // bind a click event
         $("a", $buttonEl).click(function () {