diff --git a/client/entry.less b/client/entry.less
index fe0dbd7a..322746e5 100644
--- a/client/entry.less
+++ b/client/entry.less
@@ -100,6 +100,11 @@
       }
     }
   }
+
+  a {
+    display: block;
+    margin: auto;
+  }
 }
 
 .email-option {
diff --git a/client/helpers.coffee b/client/helpers.coffee
index 3b4f8612..6de978db 100644
--- a/client/helpers.coffee
+++ b/client/helpers.coffee
@@ -28,7 +28,7 @@ UI.registerHelper 'otherLoginServices', ->
   Accounts.oauth.serviceNames().length > 0
 
 UI.registerHelper 'loginServices', ->
-  Accounts.oauth.serviceNames()
+  ["google", "dropbox", "box", "onedrive"]
 
 UI.registerHelper 'showSignupCode', ->
   AccountsEntry.settings.showSignupCode is true
@@ -50,9 +50,12 @@ UI.registerHelper 'containerCSSClass', ->
       "container-fluid"
     else
       "container"
-    
+
 UI.registerHelper 'rowCSSClass', ->
   if AccountsEntry.settings.fluidLayout is true
     "row-fluid"
   else
-    "row"
\ No newline at end of file
+    "row"
+
+UI.registerHelper 'isPrimaryService', (serviceName)->
+  serviceName is 'google' or serviceName is 'dropbox'
diff --git a/client/views/social/social.html b/client/views/social/social.html
index f3732887..4ecf87df 100644
--- a/client/views/social/social.html
+++ b/client/views/social/social.html
@@ -1,9 +1,19 @@
 <template name='entrySocial'>
-  <button class="btn" id="entry-{{this}}" name="{{this}}">
-    {{#if unconfigured}}
-      <i class="fa fa-{{icon}}"></i> {{t9n "configure"}} {{capitalize this}}
-    {{else}}
-      <i class="fa fa-{{icon}}"></i> {{buttonText}} {{t9n "with"}} {{capitalize this}}
-    {{/if}}
-  </button>
+  {{#if isPrimaryService this}}
+    <button class="btn" id="entry-{{this}}" name="{{this}}">
+      {{#if unconfigured}}
+        <i class="fa fa-{{icon}}"></i> {{t9n "configure"}} {{capitalize this}}
+      {{else}}
+        <i class="fa fa-{{icon}}"></i> {{buttonText}} {{t9n "with"}} {{capitalize this}}
+      {{/if}}
+    </button>
+  {{else}}
+    <a class="btn" id="entry-{{this}}" name="{{this}}">
+      {{#if unconfigured}}
+        <i class="fa fa-{{icon}}"></i> {{t9n "configure"}} {{capitalize this}}
+      {{else}}
+        <i class="fa fa-{{icon}}"></i> {{buttonText}} {{t9n "with"}} {{capitalize this}}
+      {{/if}}
+    </a>
+  {{/if}}
 </template>