diff --git a/SparkleShare/SparkleKeys.cs b/SparkleShare/SparkleKeys.cs
index 2200d528..362d16d5 100644
--- a/SparkleShare/SparkleKeys.cs
+++ b/SparkleShare/SparkleKeys.cs
@@ -65,7 +65,7 @@ namespace SparkleShare {
             else
                 SparkleHelpers.DebugInfo ("Auth", "Could not create key pair '" + key_file_path + "'");
 
-            return return new string [] { key_file_path, key_file_path + ".pub" };
+            return new string [] { key_file_path, key_file_path + ".pub" };
         }
 
 
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
index 0b9749c0..d46a9e7a 100755
--- a/SparkleShare/SparkleSetupController.cs
+++ b/SparkleShare/SparkleSetupController.cs
@@ -294,7 +294,7 @@ namespace SparkleShare {
 
                     // Create an easily accessible copy of the public
                     // key in the user's SparkleShare folder
-                    File.Copy (private_key_file_path + ".pub", link_code_file_path, true);
+                    File.Copy (key_pair [1], link_code_file_path, true);
                 })
             ).Start ();