diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 6af0f7c03..1a2194df6 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -710,16 +710,6 @@ private void ResolveConflict ()
         }
 
 
-        public override void CreateInitialChangeSet ()
-        {
-            base.CreateInitialChangeSet ();
-
-            Add ();
-            string message = FormatCommitMessage ();
-            Commit (message);
-        }
-
-
         // Git doesn't track empty directories, so this method
         // fills them all with a hidden empty file.
         //
diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index cfb198ff3..968e744e7 100755
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -165,10 +165,10 @@ public SparkleRepoBase (string path)
                 this.status = status;
             };
 
+            this.identifier = Identifier;
+
             if (CurrentRevision == null)
                 CreateInitialChangeSet ();
-			
-			this.identifier = Identifier;
 				
 
             CreateWatcher ();
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index 024762a30..bf70d8969 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -189,6 +189,7 @@ public SparkleSetupController ()
                 }
 
                 if (this.current_page == PageType.Syncing ||
+                    this.current_page == PageType.Finished ||
                     this.current_page == PageType.CryptoSetup ||
                     this.current_page == PageType.CryptoPassword) {