diff --git a/main.go b/main.go
index ee2f360..b5b60d9 100644
--- a/main.go
+++ b/main.go
@@ -42,11 +42,6 @@ func main() {
         log.Fatal(err)
     }
 
-    // sess, err := api.UnwrapJWT(jwt)
-    // if err != nil {
-    //     log.Fatal(err)
-    // }
-
     peer, err := gui.PeerDialogRun(ui.Window)
     if err != nil {
         log.Fatal(err)
@@ -68,11 +63,11 @@ func main() {
     if err != nil {
         log.Fatal(err)
     }
+    myPub := elliptic.Marshal(crypto.Curve, myX, myY)
 
     peerKey, err := db.LookupPubKey(peer)
     if err == sql.ErrNoRows {
         outfile := os.Getenv("HOME") + "/" + user + ".ecdh"
-        myPub := elliptic.Marshal(crypto.Curve, myX, myY)
         err = ioutil.WriteFile(outfile, myPub, 0666)
         if err != nil {
             log.Fatal(err)
@@ -102,11 +97,6 @@ func main() {
             if err != nil {
                 log.Fatal(err)
             }
-
-            err = db.UploadKey(user, myPub, myPriv)
-            if err != nil {
-                log.Fatal(err)
-            }
         } else {
             log.Fatal("No public key was selected.")
         }
@@ -114,6 +104,11 @@ func main() {
         log.Fatal(err)
     }
 
+    err = db.UploadKey(user, myPub, myPriv)
+    if err != nil {
+        log.Fatal(err)
+    }
+
     peerX, peerY = elliptic.Unmarshal(crypto.Curve, peerKey)
     if peerX == nil {
         log.Fatal("Invalid key data")
@@ -200,6 +195,6 @@ func MessagePoll(jwt []byte, user, peer string, ui *gui.UI) {
                 glib.IdleAdd(ui.ShowMessage, output)
             }
         }
-        time.Sleep(2 * time.Second)
+        time.Sleep(time.Second)
     }
 }