diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs
index 7a0478f1..790c42f5 100644
--- a/SparkleShare/SparkleIntro.cs
+++ b/SparkleShare/SparkleIntro.cs
@@ -170,9 +170,13 @@ namespace SparkleShare {
 
                     HBox layout_server = new HBox (true, 0);
 
-                        ServerEntry = new SparkleEntry () {
-                            ExampleText = _("address-to-server.com")
-                        };
+                        ServerEntry = new SparkleEntry () { };
+
+                        if (0 < SparkleShare.Controller.PrevServer.Length) {
+                            ServerEntry.Text = SparkleShare.Controller.PrevServer.Trim();
+                            ServerEntry.ExampleTextActive = false;
+                        } else
+                            ServerEntry.ExampleText = _("address-to-server.com");
                         
                         ServerEntry.Changed += CheckServerForm;
 
@@ -250,9 +254,13 @@ namespace SparkleShare {
 
                 HBox layout_folder = new HBox (true, 0);
 
-                    FolderEntry = new SparkleEntry () {
-                        ExampleText = _("Folder")
-                    };
+                    FolderEntry = new SparkleEntry () { };
+
+                    if (0 < SparkleShare.Controller.PrevFolder.Length) {
+                        FolderEntry.Text = SparkleShare.Controller.PrevFolder.Trim();
+                        FolderEntry.ExampleTextActive = false;
+                    } else
+                        FolderEntry.ExampleText = _("Folder");
                     
                     FolderEntry.Changed += CheckServerForm;
 
@@ -273,6 +281,9 @@ namespace SparkleShare {
                         string server         = ServerEntry.Text;
                         string canonical_name = System.IO.Path.GetFileNameWithoutExtension (folder_name);
 
+                        SparkleShare.Controller.PrevServer = ServerEntry.Text;
+                        SparkleShare.Controller.PrevFolder = FolderEntry.Text;
+
                         if (radio_button_gitorious.Active)
                             server = "gitorious.org";