diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index 5dcd461e..9bc7df2f 100755
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -73,10 +73,10 @@ namespace SparkleShare {
                     UnixFileInfo file_info = new UnixFileInfo (desktopfile_path);
                     file_info.Create (FileAccessPermissions.UserReadWriteExecute);
 
-                    SparkleHelpers.DebugInfo ("Controller", "Added " + app_path + " to login items");
+                    SparkleHelpers.DebugInfo ("Controller", "Added SparkleShare to login items");
 
                 } catch (Exception e) {
-                    SparkleHelpers.DebugInfo ("Controller", "Failed adding " + app_path + " to login items: " + e.Message);
+                    SparkleHelpers.DebugInfo ("Controller", "Failed adding SparkleShare to login items: " + e.Message);
                 }
             }
         }
diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs
index 29578ac2..59907757 100755
--- a/SparkleShare/SparkleSetup.cs
+++ b/SparkleShare/SparkleSetup.cs
@@ -620,11 +620,13 @@ namespace SparkleShare {
 
                             Button finish_button = new Button (_("Finish"));
                             finish_button.Clicked += delegate {
-                                Controller.FinishPageCompleted ();
+                                Controller.TutorialPageCompleted ();
                             };
 
 
-                            check_button = new CheckButton ("Add SparkleShare to startup items");
+                            CheckButton check_button = new CheckButton ("Add SparkleShare to startup items") {
+                                Active = true
+                            };
 
                             check_button.Toggled += delegate {
                                 Controller.StartupItemChanged (check_button.Active);
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index 2f2fadf0..c175a4ae 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -152,10 +152,8 @@ namespace SparkleShare {
                 }
 
                 if (page_type == PageType.Add) {
-                    if (!Program.Controller.FirstRun &&
-                        (TutorialPageNumber == 0 ||
-                        TutorialPageNumber > 4)) {
 
+                    if (!Program.Controller.FirstRun && TutorialPageNumber == 0) {
                         if (ChangePageEvent != null)
                             ChangePageEvent (page_type, null);
 
@@ -163,7 +161,6 @@ namespace SparkleShare {
                             ShowWindowEvent ();
 
                         SelectedPluginChanged (SelectedPluginIndex);
-
                     }
 
                     return;
@@ -235,6 +232,8 @@ namespace SparkleShare {
             TutorialPageNumber++;
 
             if (TutorialPageNumber == 5) {
+                TutorialPageNumber = 0;
+
                 if (HideWindowEvent != null)
                     HideWindowEvent ();