From 63e95f0f55e1b4ab494341e7bc63c8ee23fdbdd8 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 13 Apr 2017 18:27:30 -0400
Subject: [PATCH] check for keys already existing

---
 src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs b/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs
index e1e23ac35e..b6fb5f7a09 100644
--- a/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs
+++ b/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs
@@ -11,12 +11,16 @@ namespace Bit.Core.Models.Api
 
         public User ToUser(User existingUser)
         {
-            if(!string.IsNullOrWhiteSpace(PublicKey))
+            if(string.IsNullOrWhiteSpace(existingUser.PublicKey) && !string.IsNullOrWhiteSpace(PublicKey))
             {
                 existingUser.PublicKey = PublicKey;
             }
 
-            existingUser.PrivateKey = EncryptedPrivateKey;
+            if(string.IsNullOrWhiteSpace(existingUser.PrivateKey))
+            {
+                existingUser.PrivateKey = EncryptedPrivateKey;
+            }
+
             return existingUser;
         }
     }