diff --git a/app/controllers/signup_controller.rb b/app/controllers/signup_controller.rb
index 7a80051c9254..0d9f1ea623b0 100644
--- a/app/controllers/signup_controller.rb
+++ b/app/controllers/signup_controller.rb
@@ -19,11 +19,15 @@ def create
     @user = ::User.new_with_organization(@organization)
 
     if params[:google_access_token].present? && @google_plus_config.present?
+      # Keep in mind get_user_data can return nil
       user_data = GooglePlusAPI.new.get_user_data(params[:google_access_token])
     end
 
     if user_data
       user_data.set_values(@user)
+      if params[:user] && params[:user][:username].present?
+        @user.username = params[:user][:username]
+      end
     else
       @user.username = params[:user][:username]
       @user.email = params[:user][:email]
diff --git a/app/views/signup/signup.html.erb b/app/views/signup/signup.html.erb
index e260e1b6a00b..299623a79ca2 100644
--- a/app/views/signup/signup.html.erb
+++ b/app/views/signup/signup.html.erb
@@ -28,7 +28,7 @@
               <% end %>
 
               <%= form_for @user, url: CartoDB.url(self, 'signup_organization_user'),  html: { class: "js-Loading-form" } do |f| %>
-                <input type="hidden" value="" id="google_access_token" name="google_access_token" />
+                <input type="hidden" value="<%= params[:google_access_token] %>" id="google_access_token" name="google_access_token" />
                 <input type="hidden" value="0" id="google_access_filled" name="google_access_filled" />
 
                 <div class="Sessions-fieldsGorup">
@@ -207,4 +207,4 @@
       </div>
     </div>
   </footer>
-</div>
\ No newline at end of file
+</div>