diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs
index 7fac370a..3b8b0235 100755
--- a/SparkleShare/SparkleSetup.cs
+++ b/SparkleShare/SparkleSetup.cs
@@ -118,6 +118,12 @@ namespace SparkleShare {
 
                         AddButton (NextButton);
                         Add (Table);
+                        
+                        Controller.UpdateSetupContinueButtonEvent += delegate (bool button_enabled) {
+                            Application.Invoke (delegate {
+                                NextButton.Sensitive = button_enabled;
+                            });
+                        };
 
                         Controller.CheckSetupPage (NameEntry.Text, EmailEntry.Text);