diff --git a/keepercommander/commands/register.py b/keepercommander/commands/register.py
index 566aa5b6a..cbcb2b95a 100644
--- a/keepercommander/commands/register.py
+++ b/keepercommander/commands/register.py
@@ -517,10 +517,10 @@ def prepare_request(params, kwargs, curr_sf, users, teams, rec_uids, *,
                             if keys:
                                 if keys.aes:
                                     if params.forbid_rsa:
-                                        to.typedSharedFolderKey.encryptedKey = crypto.encrypt_aes_v2(sf_key, params.data_key)
+                                        to.typedSharedFolderKey.encryptedKey = crypto.encrypt_aes_v2(sf_key, keys.aes)
                                         to.typedSharedFolderKey.encryptedKeyType = folder_pb2.encrypted_by_data_key_gcm
                                     else:
-                                        to.typedSharedFolderKey.encryptedKey = crypto.encrypt_aes_v1(sf_key, params.data_key)
+                                        to.typedSharedFolderKey.encryptedKey = crypto.encrypt_aes_v1(sf_key, keys.aes)
                                         to.typedSharedFolderKey.encryptedKeyType = folder_pb2.encrypted_by_data_key
                                 elif params.forbid_rsa and keys.ec:
                                     ec_key = crypto.load_ec_public_key(keys.ec)