diff --git a/src/app/organizations/manage/events.component.html b/src/app/organizations/manage/events.component.html
index c9dcd9f0..9b50717f 100644
--- a/src/app/organizations/manage/events.component.html
+++ b/src/app/organizations/manage/events.component.html
@@ -19,9 +19,9 @@
                 {{'refresh' | i18n}}
             </button>
         </form>
-        <form #exportForm [appApiAction]="exportForm" class="d-inline">
+        <form #exportForm [appApiAction]="exportPromise" class="d-inline">
             <button type="button" class="btn btn-sm btn-outline-primary btn-submit manual ml-3"
-                [ngClass]="{loading:refreshForm.loading}" (click)="exportEvents()"
+                [ngClass]="{loading:exportForm.loading}" (click)="exportEvents()"
                 [disabled]="loaded && exportForm.loading || dirtyDates">
                 <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
                 <span>{{'export' | i18n}}</span>
diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts
index 771b027a..6e66a698 100644
--- a/src/app/organizations/manage/people.component.ts
+++ b/src/app/organizations/manage/people.component.ts
@@ -27,8 +27,8 @@ import { StorageService } from 'jslib/abstractions/storage.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
 import { OrganizationKeysRequest } from 'jslib/models/request/organizationKeysRequest';
-import { OrganizationUserBulkRequest } from 'jslib/models/request/organizationUserBulkRequest';
 import { OrganizationUserBulkConfirmRequest } from 'jslib/models/request/organizationUserBulkConfirmRequest';
+import { OrganizationUserBulkRequest } from 'jslib/models/request/organizationUserBulkRequest';
 import { OrganizationUserConfirmRequest } from 'jslib/models/request/organizationUserConfirmRequest';
 
 import { OrganizationUserUserDetailsResponse } from 'jslib/models/response/organizationUserResponse';