diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml
index 6638c83d9..49f7ac2bb 100644
--- a/app/views/users/getting_started.haml
+++ b/app/views/users/getting_started.haml
@@ -37,7 +37,7 @@
                 = label_tag 'profile[first_name]', "Your name", :class => "bootstrapped"
                 .input
                   = text_field_tag 'profile[first_name]', current_user.person.profile.first_name
-                  = image_tag 'ajax-loader.gif', :id => "form_spinner", :class => "hidden"
+                  = image_tag 'ajax-loader.gif', :id => "gs-name-form-spinner", :class => "hidden"
 
               %span.saved{:class => "hidden"}
                 = image_tag 'icons/check_yes_ok.png'
@@ -77,5 +77,3 @@
               .input
                 = link_to "#{t('.awesome_take_me_to_diaspora')} »", "#", :id => "awesome_button", :class => "btn primary"
 
-      = image_tag 'ajax-loader.gif', :id => "awesome_spinner", :class => "hidden"
-
diff --git a/public/javascripts/pages/users-getting-started.js b/public/javascripts/pages/users-getting-started.js
index 04adcbdaf..ec59feb8f 100644
--- a/public/javascripts/pages/users-getting-started.js
+++ b/public/javascripts/pages/users-getting-started.js
@@ -6,7 +6,7 @@ Diaspora.Pages.UsersGettingStarted = function() {
     self.tagSearch = self.instantiate("Search", body.find("form.tag_input.search_form"));
 
     $('#edit_profile').bind('ajax:success', function(evt, data, status, xhr){
-      $('#form_spinner').addClass("hidden");
+      $('#gs-name-form-spinner').addClass("hidden");
       $('.profile .saved').show();
       $('.profile .saved').fadeOut(2000);
     });
@@ -24,7 +24,7 @@ Diaspora.Pages.UsersGettingStarted = function() {
     $("#profile_first_name").bind("change", function(){
       $(this).data("cachedValue", $(this).val());
       $('#edit_profile').submit();
-      $('#form_spinner').removeClass("hidden");
+      $('#gs-name-form-spinner').removeClass("hidden");
     });
 
     $("#profile_first_name").bind("blur", function(){
@@ -41,7 +41,6 @@ Diaspora.Pages.UsersGettingStarted = function() {
       var confirmMessage = Diaspora.I18n.t("getting_started.no_tags");
 
       if(($("#as-selections-tags").find(".as-selection-item").length > 0) || confirm(confirmMessage)) {
-        $('#awesome_spinner').removeClass("hidden");
         $('.tag_input').submit();
 
         /* flash message prompt */
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index ff00e4915..a0aa3965e 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -3432,3 +3432,8 @@ a.toggle_selector
     :float none
     :height 20px
     :width 20px
+
+#gs-name-form-spinner
+  :position absolute
+  :top 24px
+  :right -33px