diff --git a/SparkleLib/SparkleFetcherBase.cs b/SparkleLib/SparkleFetcherBase.cs
index dcae841c..5df9b736 100755
--- a/SparkleLib/SparkleFetcherBase.cs
+++ b/SparkleLib/SparkleFetcherBase.cs
@@ -343,11 +343,10 @@ namespace SparkleLib {
 
         public static string GetBackend (string address)
         {
-            Uri uri           = new Uri (address);
-            int index_of_plus = uri.Scheme.IndexOf ("+");
+            if (address.StartsWith ("ssh+")) {
+				string backend = address.Substring (0, address.IndexOf ("://"));
+				backend        = backend.Substring (4);
 
-            if (index_of_plus > -1) {
-                string backend = uri.Scheme.Substring (index_of_plus + 1);
                 return char.ToUpper (backend [0]) + backend.Substring (1);
 
             } else {
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index 303909a1..415546dc 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -347,7 +347,8 @@ namespace SparkleShare {
             if (remote_path.EndsWith (".git"))
                 SyncingFolder = remote_path.Substring (0, remote_path.Length - 4);
 
-            SyncingFolder         = SyncingFolder.Replace ("-crypto", "");
+			SyncingFolder         = SyncingFolder.Replace ("-crypto", "");
+			SyncingFolder         = SyncingFolder.Replace ("_", " ");
             ProgressBarPercentage = 1.0;
 
             ChangePageEvent (PageType.Syncing, null);
@@ -434,7 +435,8 @@ namespace SparkleShare {
             if (PendingInvite.RemotePath.EndsWith (".git"))
                 SyncingFolder = PendingInvite.RemotePath.Substring (0, PendingInvite.RemotePath.Length - 4);
 
-            SyncingFolder   = SyncingFolder.Replace ("-crypto", "");
+			SyncingFolder   = SyncingFolder.Replace ("-crypto", "");
+			SyncingFolder   = SyncingFolder.Replace ("_", " ");
             PreviousAddress = PendingInvite.Address;
             PreviousPath    = PendingInvite.RemotePath;