diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts
index c99f018889..09b5fd02a6 100644
--- a/src/app/organizations/manage/people.component.ts
+++ b/src/app/organizations/manage/people.component.ts
@@ -114,9 +114,10 @@ export class PeopleComponent implements OnInit {
             this.canResetPassword = organization.canManageUsersPassword;
             this.orgUseResetPassword = organization.useResetPassword;
             this.callingUserType = organization.type;
+            this.orgHasKeys = organization.hasPublicAndPrivateKeys;
 
             // Backfill pub/priv key if necessary
-            if (!organization.hasPublicAndPrivateKeys) {
+            if (this.canResetPassword && !this.orgHasKeys) {
                 const orgShareKey = await this.cryptoService.getOrgKey(this.organizationId);
                 const orgKeys = await this.cryptoService.makeKeyPair(orgShareKey);
                 const request = new OrganizationKeysRequest(orgKeys[0], orgKeys[1].encryptedString);
@@ -127,8 +128,6 @@ export class PeopleComponent implements OnInit {
                 } else {
                     throw new Error(this.i18nService.t('resetPasswordOrgKeysError'));
                 }
-            } else {
-                this.orgHasKeys = true;
             }
 
             await this.load();