diff --git a/apps/web/src/app/accounts/accept-organization.component.html b/apps/web/src/app/accounts/accept-organization.component.html
index 25d90d93e0..3aef47df22 100644
--- a/apps/web/src/app/accounts/accept-organization.component.html
+++ b/apps/web/src/app/accounts/accept-organization.component.html
@@ -11,7 +11,7 @@
     </p>
   </div>
 </div>
-<div class="container" *ngIf="!loading && !authed">
+<div class="container" *ngIf="!loading">
   <div class="row justify-content-md-center mt-5">
     <div class="col-5">
       <p class="lead text-center mb-4">{{ "joinOrganization" | i18n }}</p>
diff --git a/apps/web/src/app/accounts/accept-organization.component.ts b/apps/web/src/app/accounts/accept-organization.component.ts
index ab6157a32f..4153c9c516 100644
--- a/apps/web/src/app/accounts/accept-organization.component.ts
+++ b/apps/web/src/app/accounts/accept-organization.component.ts
@@ -1,10 +1,10 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute, Params, Router } from "@angular/router";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationUserAcceptRequest } from "@bitwarden/common/abstractions/organization-user/requests";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
@@ -31,19 +31,28 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
     platformUtilsService: PlatformUtilsService,
     i18nService: I18nService,
     route: ActivatedRoute,
-    private apiService: ApiService,
     stateService: StateService,
     private cryptoService: CryptoService,
     private policyApiService: PolicyApiServiceAbstraction,
     private policyService: PolicyService,
     private logService: LogService,
     private organizationApiService: OrganizationApiServiceAbstraction,
-    private organizationUserService: OrganizationUserService
+    private organizationUserService: OrganizationUserService,
+    private messagingService: MessagingService
   ) {
     super(router, platformUtilsService, i18nService, route, stateService);
   }
 
   async authedHandler(qParams: Params): Promise<void> {
+    const needsReAuth = (await this.stateService.getOrganizationInvitation()) != null;
+    if (!needsReAuth) {
+      // Accepting an org invite requires authentication from a logged out state
+      this.messagingService.send("logout", { redirect: false });
+      await this.prepareOrganizationInvitation(qParams);
+      return;
+    }
+
+    // User has already logged in and passed the Master Password policy check
     this.actionPromise = this.prepareAcceptRequest(qParams).then(async (request) => {
       await this.organizationUserService.postOrganizationUserAccept(
         qParams.organizationId,
@@ -52,6 +61,7 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
       );
     });
 
+    await this.stateService.setOrganizationInvitation(null);
     await this.actionPromise;
     this.platformUtilService.showToast(
       "success",
@@ -60,17 +70,11 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
       { timeout: 10000 }
     );
 
-    await this.stateService.setOrganizationInvitation(null);
     this.router.navigate(["/vault"]);
   }
 
   async unauthedHandler(qParams: Params): Promise<void> {
-    this.orgName = qParams.organizationName;
-    if (this.orgName != null) {
-      // Fix URL encoding of space issue with Angular
-      this.orgName = this.orgName.replace(/\+/g, " ");
-    }
-    await this.stateService.setOrganizationInvitation(qParams);
+    await this.prepareOrganizationInvitation(qParams);
   }
 
   private async prepareAcceptRequest(qParams: Params): Promise<OrganizationUserAcceptRequest> {
@@ -121,4 +125,13 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
 
     return false;
   }
+
+  private async prepareOrganizationInvitation(qParams: Params): Promise<void> {
+    this.orgName = qParams.organizationName;
+    if (this.orgName != null) {
+      // Fix URL encoding of space issue with Angular
+      this.orgName = this.orgName.replace(/\+/g, " ");
+    }
+    await this.stateService.setOrganizationInvitation(qParams);
+  }
 }
diff --git a/apps/web/src/app/accounts/update-password.component.html b/apps/web/src/app/accounts/update-password.component.html
index bf32967c0e..9678ee425f 100644
--- a/apps/web/src/app/accounts/update-password.component.html
+++ b/apps/web/src/app/accounts/update-password.component.html
@@ -52,6 +52,7 @@
                     [password]="masterPassword"
                     [email]="email"
                     [showText]="true"
+                    (passwordStrengthResult)="getStrengthResult($event)"
                   ></app-password-strength>
                 </div>
               </div>
diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts
index 008ed5106f..12f499a01c 100644
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@@ -112,7 +112,7 @@ export class AppComponent implements OnDestroy, OnInit {
             this.router.navigate(["/"]);
             break;
           case "logout":
-            this.logOut(!!message.expired);
+            this.logOut(!!message.expired, message.redirect);
             break;
           case "lockVault":
             await this.vaultTimeoutService.lock();
@@ -220,7 +220,7 @@ export class AppComponent implements OnDestroy, OnInit {
     this.destroy$.complete();
   }
 
-  private async logOut(expired: boolean) {
+  private async logOut(expired: boolean, redirect = true) {
     await this.eventUploadService.uploadEvents();
     const userId = await this.stateService.getUserId();
     await Promise.all([
@@ -247,7 +247,9 @@ export class AppComponent implements OnDestroy, OnInit {
 
       await this.stateService.clean({ userId: userId });
       Swal.close();
-      this.router.navigate(["/"]);
+      if (redirect) {
+        this.router.navigate(["/"]);
+      }
     });
   }
 
diff --git a/apps/web/src/app/common/base.accept.component.ts b/apps/web/src/app/common/base.accept.component.ts
index dcca9e061c..e09e62a271 100644
--- a/apps/web/src/app/common/base.accept.component.ts
+++ b/apps/web/src/app/common/base.accept.component.ts
@@ -35,6 +35,7 @@ export abstract class BaseAcceptComponent implements OnInit {
       let errorMessage: string = null;
       if (!error) {
         this.authed = await this.stateService.getIsAuthenticated();
+        this.email = qParams.email;
 
         if (this.authed) {
           try {
@@ -44,7 +45,6 @@ export abstract class BaseAcceptComponent implements OnInit {
             errorMessage = e.message;
           }
         } else {
-          this.email = qParams.email;
           await this.unauthedHandler(qParams);
         }
       }