diff --git a/app/views/users/registrations/finish_signup.html.erb b/app/views/users/registrations/finish_signup.html.erb
index fa7bb621e..79f160a51 100644
--- a/app/views/users/registrations/finish_signup.html.erb
+++ b/app/views/users/registrations/finish_signup.html.erb
@@ -3,6 +3,10 @@
 <%= form_for current_user, as: :user, url: do_finish_signup_path, html: { role: 'form'} do |f| %>
   <%= render 'shared/errors', resource: current_user %>
 
+  <div class='callout primary'>
+    <%= t("omniauth.finish_signup.username_warning") %>
+  </div>
+
   <% if current_user.errors.include? :username %>
     <%= f.text_field :username, placeholder: t("devise_views.users.registrations.new.username_label") %>
   <% else %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8609c079c..b5899e63a 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -542,6 +542,7 @@ en:
   omniauth:
     finish_signup:
       title: "Additional details"
+      username_warning: "Due to a change in the way we interact with social networks, it is possible that your username now appears as 'already in use'. If that is your case, please choose a different username."
     twitter:
       sign_in: "Sign in with Twitter"
       sign_up: "Sign up with Twitter"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a15528d5a..468bb2dd7 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -542,6 +542,7 @@ es:
   omniauth:
     finish_signup:
       title: "Detalles adicionales de tu cuenta"
+      username_warning: "Debido a que hemos cambiado la forma en la que nos conectamos con redes sociales y es que tu nombre de usuario aparezca como 'ya en uso', incluso si antes podías acceder con él. Si es tu caso, por favor elije un nombre de usuario distinto."
     twitter:
       sign_in: "Entra con Twitter"
       sign_up: "Regístrate con Twitter"