diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs
index b33b84e1..eb50d794 100755
--- a/SparkleShare/Mac/SparkleSetup.cs
+++ b/SparkleShare/Mac/SparkleSetup.cs
@@ -133,6 +133,11 @@ namespace SparkleShare {
                 Buttons.Add (CancelButton);
 
                 Controller.CheckSetupPage (FullNameTextField.StringValue, EmailTextField.StringValue);
+
+                if (FullNameTextField.StringValue.Equals (""))
+                    MakeFirstResponder ((NSResponder) FullNameTextField);
+                else
+                    MakeFirstResponder ((NSResponder) EmailTextField);
             }
 
             if (type == PageType.Invite) {