diff --git a/bitwarden_license/src/app/providers/clients/add-organization.component.ts b/bitwarden_license/src/app/providers/clients/add-organization.component.ts
index b37da272e0..4b7cca607f 100644
--- a/bitwarden_license/src/app/providers/clients/add-organization.component.ts
+++ b/bitwarden_license/src/app/providers/clients/add-organization.component.ts
@@ -7,6 +7,7 @@ import {
 } from '@angular/core';
 import { ToasterService } from 'angular2-toaster';
 
+import { ApiService } from 'jslib-common/abstractions/api.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { UserService } from 'jslib-common/abstractions/user.service';
@@ -17,7 +18,7 @@ import { ProviderService } from '../services/provider.service';
 
 import { Organization } from 'jslib-common/models/domain/organization';
 import { Provider } from 'jslib-common/models/domain/provider';
-import { ApiService } from 'jslib-common/abstractions';
+
 import { PlanType } from 'jslib-common/enums/planType';
 
 const DisallowedPlanTypes = [PlanType.Free, PlanType.FamiliesAnnually2019, PlanType.FamiliesAnnually];
diff --git a/jslib b/jslib
index fdf0eb989b..65c998dd0d 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit fdf0eb989be49e6f5d8215f2eac1da275923f427
+Subproject commit 65c998dd0d8798f1ea1ee321bb490d5b94074f0c
diff --git a/src/app/common/base.people.component.ts b/src/app/common/base.people.component.ts
index 0fe943d2f2..e6ba3f32ed 100644
--- a/src/app/common/base.people.component.ts
+++ b/src/app/common/base.people.component.ts
@@ -106,6 +106,10 @@ export abstract class BasePeopleComponent<UserType extends ProviderUserUserDetai
     async load() {
         const response = await this.getUsers();
         this.statusMap.clear();
+        for (const status of Utils.iterateEnum(this.userStatusType)) {
+            this.statusMap.set(status, []);
+        }
+
         this.allUsers = response.data != null && response.data.length > 0 ? response.data : [];
         this.allUsers.sort(Utils.getSortFunction(this.i18nService, 'email'));
         this.allUsers.forEach(u => {
@@ -311,4 +315,4 @@ export abstract class BasePeopleComponent<UserType extends ProviderUserUserDetai
         }
     }
 
-}
\ No newline at end of file
+}