diff --git a/config/passwordManager.js b/config/passwordManager.js
index a1b639b..050ded3 100644
--- a/config/passwordManager.js
+++ b/config/passwordManager.js
@@ -47,6 +47,18 @@ export default {
         android: 'https://play.google.com/store/apps/details?id=com.dashlane',
       },
     },
+    {
+      name: 'Bitwarden',
+      image: '/static/img/bitwarden.jpg',
+      url: 'https://www.bitwarden.com/',
+      sources: {
+        windows: 'https://vault.bitwarden.com/download/?app=desktop&platform=windows',
+        macos: 'https://vault.bitwarden.com/download/?app=desktop&platform=macos',
+        ios:
+          'https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8',
+        android: 'https://play.google.com/store/apps/details?id=com.x8bit.bitwarden',
+      },
+    },
   ],
   resources: [
     {
diff --git a/config/twoFactor.js b/config/twoFactor.js
index 62895c1..d066c8f 100644
--- a/config/twoFactor.js
+++ b/config/twoFactor.js
@@ -8,8 +8,32 @@ export default {
     \n\n**You should not use your phone number as a two-factor method.**
     
     \n\nAt minimum 2FA should be installed on accounts that can lock you out of other accounts: e.g. a Google account, email applications, an Apple ID, and financial accounts. For stronger security, ensure that 2FA is enabled on every service you use that supports it.
+
+    \n\n**Note:** Using an all-in-one solution like 1Password for both password management *and* 2FA creates a single point of failure. Take this into account when picking your 2FA client.
     `,
   apps: [
+    {
+      name: 'Authy',
+      image: '/static/img/authy.jpg',
+      url: 'https://authy.com/',
+      sources: {
+        windows: 'https://authy.com/download/',
+        macos: 'https://authy.com/download/',
+        ios: 'https://itunes.apple.com/us/app/authy/id494168017',
+        android:
+          'https://play.google.com/store/apps/details?id=com.authy.authy',
+      },
+    },
+    {
+      name: 'Google Authenticator',
+      image: '/static/img/google-authenticator.jpg',
+      url: 'https://www.google.com/landing/2step/',
+      sources: {
+        ios: 'https://itunes.apple.com/us/app/google-authenticator/id388497605',
+        android:
+          'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en_us',
+      },
+    },
     {
       name: '1Password',
       image: '/static/img/1password.jpg',
@@ -39,28 +63,6 @@ export default {
         android: 'https://lastpass.com/android_market.php',
       },
     },
-    {
-      name: 'Authy',
-      image: '/static/img/authy.jpg',
-      url: 'https://authy.com/',
-      sources: {
-        windows: 'https://authy.com/download/',
-        macos: 'https://authy.com/download/',
-        ios: 'https://itunes.apple.com/us/app/authy/id494168017',
-        android:
-          'https://play.google.com/store/apps/details?id=com.authy.authy',
-      },
-    },
-    {
-      name: 'Google Authenticator',
-      image: '/static/img/google-authenticator.jpg',
-      url: 'https://www.google.com/landing/2step/',
-      sources: {
-        ios: 'https://itunes.apple.com/us/app/google-authenticator/id388497605',
-        android:
-          'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en_us',
-      },
-    },
     {
       name: 'YubiKey',
       image: '/static/img/yubico.jpg',
diff --git a/static/img/bitwarden.jpg b/static/img/bitwarden.jpg
new file mode 100644
index 0000000..7c4e553
Binary files /dev/null and b/static/img/bitwarden.jpg differ