diff --git a/app/views/users/getting_started.html.haml b/app/views/users/getting_started.html.haml
index 424e7f867..668f6a918 100644
--- a/app/views/users/getting_started.html.haml
+++ b/app/views/users/getting_started.html.haml
@@ -53,7 +53,12 @@
       %span.current_gs_step
         = t('.connect_services')
     %br
-
+    - if @step != 4
+      = link_to t('.finished'), getting_started_path(:step => 4)
+    - else
+      %span.current_gs_step
+        = t('.finished')
+    %br
 .span-15.last
   .floating{:style=>"min-height:500px;"}
     = render "users/getting_started/step_#{@step}", :current_user => current_user
diff --git a/app/views/users/getting_started/_step_4.html.haml b/app/views/users/getting_started/_step_4.html.haml
index e4d51b2e1..24d37f5cc 100644
--- a/app/views/users/getting_started/_step_4.html.haml
+++ b/app/views/users/getting_started/_step_4.html.haml
@@ -4,7 +4,7 @@
 
 
 %h1
-  = t('.set_up', :name => current_user.person.profile.first_name)
+  = t('.set_up', :name => current_user.person.profile.first_name || current_user.username)
   .description
     = t('.ready_to_share')
     %ul.inline_aspect_listing
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index d14f5172a..1130ab125 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -167,6 +167,7 @@ en:
           edit_profile: "Edit your profile"
           define_aspects: "Define your aspects"
           connect_services: "Connect your services"
+          finished: "Finished!"
           skip: "skip getting started"
           save_and_continue: "Save and continue"
           step_1: