diff --git a/SparkleShare/Mac/SparkleMacController.cs b/SparkleShare/Mac/SparkleMacController.cs
index fd7a97c1..761c7953 100755
--- a/SparkleShare/Mac/SparkleMacController.cs
+++ b/SparkleShare/Mac/SparkleMacController.cs
@@ -111,13 +111,13 @@ namespace SparkleShare {
 		{
             this.watcher = new SparkleMacWatcher (SparkleConfig.DefaultConfig.FoldersPath);
 
-			if (!Directory.Exists (SparkleConfig.DefaultConfig.FoldersPath)) {
-				Directory.CreateDirectory (SparkleConfig.DefaultConfig.FoldersPath);
-				return true;
+            if (!Directory.Exists (SparkleConfig.DefaultConfig.FoldersPath)) {
+                Directory.CreateDirectory (SparkleConfig.DefaultConfig.FoldersPath);
+                return true;
 
-			} else {
-				return false;
-			}
+            } else {
+                return false;
+            }
 		}
 
 		
diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs
index 55989bf3..37996d96 100755
--- a/SparkleShare/Mac/SparkleSetup.cs
+++ b/SparkleShare/Mac/SparkleSetup.cs
@@ -70,7 +70,7 @@ namespace SparkleShare {
                         Description  = "Before we can create a SparkleShare folder on this " +
                                        "computer, we need some information from you.";
 
-                        UserInfoForm = new NSForm (new RectangleF (250, 115, 350, 64));
+                        UserInfoForm = new NSForm (new RectangleF (250, Frame.Height - 280, 350, 64));
 
                         UserInfoForm.AddEntry ("Full Name:");
                         UserInfoForm.AddEntry ("Email Address:");
@@ -80,8 +80,8 @@ namespace SparkleShare {
                         UserInfoForm.Cells [0].LineBreakMode = NSLineBreakMode.TruncatingTail;
                         UserInfoForm.Cells [1].LineBreakMode = NSLineBreakMode.TruncatingTail;
 
-                        UserInfoForm.Cells [0].StringValue   = Program.Controller.UserName;
-                        UserInfoForm.Cells [1].StringValue   = Program.Controller.UserEmail;
+                        UserInfoForm.Cells [0].StringValue   = Controller.GuessedUserName;
+                        UserInfoForm.Cells [1].StringValue   = Controller.GuessedUserEmail;
 
                         // TODO: Ugly hack, do properly with events
                         timer = new Timer () {
@@ -124,7 +124,7 @@ namespace SparkleShare {
 
                     case PageType.Add: {
 
-                        Header       = "Where is your remote folder?";
+                        Header       = "Where is your project?";
                         Description  = "";
 
                         ServerTypeLabel  = new NSTextField () {
@@ -133,7 +133,7 @@ namespace SparkleShare {
                             Bordered        = false,
                             Editable        = false,
                             Frame           = new RectangleF (150, Frame.Height - 159 , 160, 17),
-                            StringValue     = "Server Type:",
+                            StringValue     = "Host Type:",
                             Font            = SparkleUI.Font
                         };
 
@@ -263,7 +263,7 @@ namespace SparkleShare {
                         ContentView.AddSubview (FolderNameHelpLabel);
 
                         SyncButton = new NSButton () {
-                            Title = "Sync",
+                            Title = "Add",
                             Enabled = false
                         };
 
diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
index fa90fc84..7b0d9a8d 100755
--- a/SparkleShare/Mac/SparkleStatusIcon.cs
+++ b/SparkleShare/Mac/SparkleStatusIcon.cs
@@ -189,7 +189,7 @@ namespace SparkleShare {
                 Menu.AddItem (NSMenuItem.SeparatorItem);
     
                     SyncMenuItem = new NSMenuItem () {
-                        Title = "Add Remote Folder…"
+                        Title = "Add Project…"
                     };
                 
                     if (!Program.Controller.FirstRun) {
diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs
index c02b5100..3696cd10 100755
--- a/SparkleShare/SparkleSetup.cs
+++ b/SparkleShare/SparkleSetup.cs
@@ -77,12 +77,12 @@ namespace SparkleShare {
                                 Xalign    = 0
                             };
 
-                            NameEntry = new Entry (Program.Controller.UserName);
+                            NameEntry = new Entry (Controller.GuessedUserName);
                             NameEntry.Changed += delegate {
                                 CheckSetupPage ();
                             };
 
-                            EmailEntry = new Entry ();
+                            EmailEntry = new Entry (Controller.GuessedUserEmail);
                             EmailEntry.Changed += delegate {
                                 CheckSetupPage ();
                             };
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index 0247a543..af0b141f 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -75,6 +75,21 @@ namespace SparkleShare {
             }
         }
 
+        public string GuessedUserName {
+            get {
+                return Program.Controller.UserName;
+            }
+        }
+
+        public string GuessedUserEmail {
+            get {
+                if (Program.Controller.UserEmail.Equals ("Unknown"))
+                    return "";
+                else
+                    return Program.Controller.UserEmail;
+            }
+        }
+
 
         private string previous_server   = "";
         private string previous_folder   = "";
@@ -121,16 +136,10 @@ namespace SparkleShare {
 
         public void TutorialPageCompleted ()
         {
-            if (this.tutorial_page_number == 4) {
-                if (ChangePageEvent != null)
-                    ChangePageEvent (PageType.Add);
+            this.tutorial_page_number++;
 
-            } else {
-                this.tutorial_page_number++;
-
-                if (ChangePageEvent != null)
-                    ChangePageEvent (PageType.Tutorial);
-            }
+            if (ChangePageEvent != null)
+                ChangePageEvent (PageType.Tutorial);
         }