diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
index 90ccd26b..58c4d9cf 100755
--- a/SparkleShare/Mac/SparkleStatusIcon.cs
+++ b/SparkleShare/Mac/SparkleStatusIcon.cs
@@ -234,11 +234,10 @@ namespace SparkleShare {
                         Enabled = true
                     };
                 
-                    if (!Program.Controller.FirstRun) {
-                        SyncMenuItem.Activated += delegate {
-                            Controller.AddHostedProjectClicked ();
-                        };
-                    }
+                    SyncMenuItem.Activated += delegate {
+                        Controller.AddHostedProjectClicked ();
+                    };
+
     
                 Menu.AddItem (SyncMenuItem);
                 Menu.AddItem (NSMenuItem.SeparatorItem);
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index 08bcd946..cc2eca6a 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -108,7 +108,7 @@ namespace SparkleShare {
 
         public SparkleSetupController ()
         {
-            TutorialPageNumber = 1;
+            TutorialPageNumber = 0;
             PreviousAddress    = "";
             PreviousPath       = "";
             PreviousUrl        = "";
@@ -153,14 +153,23 @@ namespace SparkleShare {
                     return;
                 }
 
+                if (page_type == PageType.Add) {
+                    if (TutorialPageNumber < 5) {
+                        if (ShowWindowEvent != null)
+                            ShowWindowEvent ();
+
+                        return;
+
+                    } else {
+                        SelectedPluginChanged (SelectedPluginIndex);
+                    }
+                }
+
                 if (ChangePageEvent != null)
                     ChangePageEvent (page_type, null);
 
                 if (ShowWindowEvent != null)
                     ShowWindowEvent ();
-
-                if (page_type == PageType.Add)
-                    SelectedPluginChanged (SelectedPluginIndex);
             };
         }
 
@@ -194,7 +203,8 @@ namespace SparkleShare {
 
             Program.Controller.GenerateKeyPair ();
             Program.Controller.ImportPrivateKey ();
-            Program.Controller.UpdateState ();
+
+            TutorialPageNumber = 1;
 
             if (ChangePageEvent != null)
                 ChangePageEvent (PageType.Tutorial, null);
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index 2aaa456b..b69c36e3 100755
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -249,9 +249,6 @@ namespace SparkleShare {
 
                 // Opens the wizard to add a new remote folder
                 MenuItem sync_item = new MenuItem (_("Add Hosted Project…"));
-            
-                if (Program.Controller.FirstRun)
-                    sync_item.Sensitive = false;
 
                 sync_item.Activated += delegate {
                     Controller.AddHostedProjectClicked ();
diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs
index 05671aec..e65b2c98 100755
--- a/SparkleShare/SparkleStatusIconController.cs
+++ b/SparkleShare/SparkleStatusIconController.cs
@@ -145,7 +145,7 @@ namespace SparkleShare {
 
         public void AddHostedProjectClicked ()
         {
-            Program.Controller.ShowSetupWindow (PageType.Add);
+                Program.Controller.ShowSetupWindow (PageType.Add);
         }