diff --git a/plugins/oauth_client/views/auth/_generate_providers_links.html.erb b/plugins/oauth_client/views/auth/_generate_providers_links.html.erb
new file mode 100644
index 0000000..015e427
--- /dev/null
+++ b/plugins/oauth_client/views/auth/_generate_providers_links.html.erb
@@ -0,0 +1,5 @@
+<% providers.each do |provider| %>
+  <span class="provider">
+    <%= link_to provider.image ? image_tag(provider.image.public_filename) : provider.name, "/plugin/oauth_client/#{provider.strategy}?id=#{provider.id}&action=#{action}", :class => provider.strategy, :title => provider.name %>
+  </span>
+<% end %>
diff --git a/plugins/oauth_client/views/auth/_oauth_login.html.erb b/plugins/oauth_client/views/auth/_oauth_login.html.erb
index 6f59ea0..f61038f 100644
--- a/plugins/oauth_client/views/auth/_oauth_login.html.erb
+++ b/plugins/oauth_client/views/auth/_oauth_login.html.erb
@@ -1,11 +1,17 @@
 <div class="oauth-login">
   <% unless providers.empty? %>
-    <%= _('Login with:') %>
-  <% end %>
-  <% providers.each do |provider| %>
-    <span class="provider">
-      <%= link_to provider.image ? image_tag(provider.image.public_filename) : provider.name, "/plugin/oauth_client/#{provider.strategy}?id=#{provider.id}&action=external_login", :class => provider.strategy, :title => provider.name %>
-    </span>
+    <div class="providers-links">
+      <%= _('Create an account from:') %>
+      <div>
+        <%= render :partial => 'auth/generate_providers_links', :locals => {:providers => providers, :action => ""} %>
+      </div>
+      <% if OauthClientPlugin::Config.instance.create_account_for_login %>
+        <%= _('Login with:') %>
+        <div>
+        <%= render :partial => 'auth/generate_providers_links', :locals => {:providers => providers, :action => "external_login"} %>
+        </div>
+      <% end %>
+    </div>
   <% end %>
 
   <span class="provider">
--
libgit2 0.21.2