diff --git a/src/app/accounts/accept-organization.component.ts b/src/app/accounts/accept-organization.component.ts
index 40708a4eb14..9f1759fef8a 100644
--- a/src/app/accounts/accept-organization.component.ts
+++ b/src/app/accounts/accept-organization.component.ts
@@ -81,6 +81,8 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
             timeout: 10000,
         };
         this.toasterService.popAsync(toast);
+
+        await this.stateService.remove('orgInvitation');
         this.router.navigate(['/vault']);
     }
 
@@ -90,6 +92,7 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
             // Fix URL encoding of space issue with Angular
             this.orgName = this.orgName.replace(/\+/g, ' ');
         }
+        await this.stateService.save('orgInvitation', qParams);
     }
 
     private async performResetPasswordAutoEnroll(qParams: any): Promise<boolean> {
diff --git a/src/app/common/base.accept.component.ts b/src/app/common/base.accept.component.ts
index 5d9273a16aa..e94d7f5ea76 100644
--- a/src/app/common/base.accept.component.ts
+++ b/src/app/common/base.accept.component.ts
@@ -29,7 +29,7 @@ export abstract class BaseAcceptComponent implements OnInit {
 
     constructor(protected router: Router, protected toasterService: ToasterService,
         protected i18nService: I18nService, protected route: ActivatedRoute,
-        protected userService: UserService, private stateService: StateService) { }
+        protected userService: UserService, protected stateService: StateService) { }
 
     abstract authedHandler(qParams: any): Promise<void>;
     abstract unauthedHandler(qParams: any): Promise<void>;