diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index 81d1dc62..d679b3b6 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -569,9 +569,12 @@ namespace SparkleShare {
             PreviousUrl     = "";
             PreviousAddress = "";
             PreviousPath    = "";
-            this.fetch_prior_history = false;
 
+            this.fetch_prior_history = false;
+            this.saved_address     = "";
+            this.saved_remote_path = "";
             this.current_page = PageType.None;
+
             WindowIsOpen = false;
             HideWindowEvent ();
         }