diff --git a/logic/extpeers.go b/logic/extpeers.go
index 6430bddb..60e4bd73 100644
--- a/logic/extpeers.go
+++ b/logic/extpeers.go
@@ -194,9 +194,25 @@ func UpdateExtClient(newclientid string, network string, enabled bool, client *m
 	if err != nil {
 		return client, err
 	}
+	if newclientid != client.ClientID {
+		//name change only
+		client.ClientID = newclientid
+		client.LastModified = time.Now().Unix()
+		data, err := json.Marshal(&client)
+		if err != nil {
+			return nil, err
+		}
+		key, err := GetRecordKey(client.ClientID, client.Network)
+		if err != nil {
+			return nil, err
+		}
+		if err = database.Insert(key, string(data), database.EXT_CLIENT_TABLE_NAME); err != nil {
+			return client, err
+		}
+		return client, nil
+	}
 	client.ClientID = newclientid
 	client.Enabled = enabled
-	client.PublicKey = ""
 	SetClientACLs(client, newACLs)
 	if err = CreateExtClient(client); err != nil {
 		return client, err