diff --git a/app/views/photos/_new_profile_photo.haml b/app/views/photos/_new_profile_photo.haml
index a31274da7..fa3638ea7 100644
--- a/app/views/photos/_new_profile_photo.haml
+++ b/app/views/photos/_new_profile_photo.haml
@@ -55,6 +55,10 @@
 #profile_photo_upload
   = owner_image_tag(:thumb_medium)
 
+  -if !aspect.nil? && aspect == :getting_started
+    %br
+    %br
+
   #file-upload.button
     =t('.upload')
 
diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml
index cc31ab940..66d2d5b42 100644
--- a/app/views/users/getting_started.haml
+++ b/app/views/users/getting_started.haml
@@ -74,12 +74,18 @@
               = link_to "hooking up your Facebook account", "auth/facebook?callback_url=#{getting_started_url}"
               to Diaspora.  We can pull your name and photo, and enable cross-positng.
 
-          .span-6
+          .span-12
             = form_for current_user.person.profile do |profile|
-              = profile.text_field :first_name
+              .span-5
+                = profile.text_field :first_name, :placeholder => t('profiles.edit.first_name')
+
+              .span-7.last
+                = render 'photos/new_profile_photo', :aspect => :getting_started, :person => current_user.person
 
               %br
-              = render 'photos/new_profile_photo', :aspect => :getting_started, :person => current_user.person
+              .span-6.prepend-6.last
+                .right
+                  = profile.submit "Save"
 
       %li.follow_interests
         .getting_started_number
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index e7442cded..5b3da87b4 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -3218,6 +3218,17 @@ ul#getting_started
 
   .profile
     :min-height 260px
+    #profile_photo_upload
+      :padding
+        :left 30px
+      img
+        :position relative
+        :float right
+      .button
+        :top 10px
+        :left 69px
+    .button
+      :top 20px
 
 #right_service_icons
   :text-align center