diff --git a/jslib b/jslib
index bdbb01317d..bea9e06506 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit bdbb01317d6b41a9c0f74d47bf89e8ed11631fdc
+Subproject commit bea9e06506424ba07764f68eaaaa9161a12da767
diff --git a/src/app/accounts/two-factor-options.component.ts b/src/app/accounts/two-factor-options.component.ts
index 49c6b14f04..4bf541581b 100644
--- a/src/app/accounts/two-factor-options.component.ts
+++ b/src/app/accounts/two-factor-options.component.ts
@@ -35,6 +35,10 @@ export class TwoFactorOptionsComponent implements OnInit {
         private platformUtilsService: PlatformUtilsService) { }
 
     ngOnInit() {
+        if (this.authService.twoFactorProviders.has(TwoFactorProviderType.OrganizationDuo)) {
+            this.providers.push(TwoFactorProviders[TwoFactorProviderType.OrganizationDuo]);
+        }
+
         if (this.authService.twoFactorProviders.has(TwoFactorProviderType.Authenticator)) {
             this.providers.push(TwoFactorProviders[TwoFactorProviderType.Authenticator]);
         }
diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index ed95f9e31c..8bfe9fbf92 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -34,7 +34,8 @@
                 </div>
             </div>
         </ng-container>
-        <ng-container *ngIf="selectedProviderType === providerType.Duo">
+        <ng-container *ngIf="selectedProviderType === providerType.Duo ||
+                        selectedProviderType === providerType.OrganizationDuo">
             <div id="duo-frame"><iframe id="duo_iframe"></iframe></div>
             <div class="box last">
                 <div class="box-content">
@@ -55,7 +56,8 @@
         </div>
         <div class="buttons">
             <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick
-                    *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo">
+                    *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && 
+                        selectedProviderType !== providerType.OrganizationDuo">
                 <span [hidden]="form.loading"><i class="fa fa-sign-in"></i> {{'continue' | i18n}}</span>
                 <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
             </button>
diff --git a/src/app/accounts/two-factor.component.ts b/src/app/accounts/two-factor.component.ts
index c58a208fa3..139bb9fae5 100644
--- a/src/app/accounts/two-factor.component.ts
+++ b/src/app/accounts/two-factor.component.ts
@@ -85,6 +85,7 @@ export class TwoFactorComponent implements OnInit {
                 // TODO: init u2f
                 break;
             case TwoFactorProviderType.Duo:
+            case TwoFactorProviderType.OrganizationDuo:
                 setTimeout(() => {
                     (window as any).Duo.init({
                         host: params.Host,
diff --git a/src/images/two-factor/6.png b/src/images/two-factor/6.png
new file mode 100644
index 0000000000..ab2e434036
Binary files /dev/null and b/src/images/two-factor/6.png differ
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 0998baeb61..7dcf6e6a3d 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -537,6 +537,10 @@
     "message": "Verify with Duo Security using the Duo Mobile app, SMS, phone call, or U2F security key.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
+  "duoOrganizationDesc": {
+    "message": "Verify with Duo Security for your organization using the Duo Mobile app, SMS, phone call, or U2F security key.",
+    "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
+  },
   "u2fDesc": {
     "message": "Use any FIDO U2F enabled security key to access your account."
   },
@@ -1010,5 +1014,9 @@
   },
   "toggleOptions": {
     "message": "Toggle Options"
+  },
+  "organization": {
+    "message": "Organization",
+    "description": "An entity of multiple related people (ex. a team or business organization)."
   }
 }