diff --git a/source/_integrations/imap.markdown b/source/_integrations/imap.markdown
index 6471c32ccec..2967737548d 100644
--- a/source/_integrations/imap.markdown
+++ b/source/_integrations/imap.markdown
@@ -20,17 +20,27 @@ The IMAP integration is observing your [IMAP server](https://en.wikipedia.org/wi
 
 ### Gmail with App Password
 
-If you’re going to use Gmail, you need to create an [App Password](https://support.google.com/mail/answer/185833).
+If you’re going to use Gmail, 2-step verification must be enabled on your Gmail account.  Once it is enabled, you need to create an [App Password](https://support.google.com/mail/answer/185833).
 
 1. Go to your [Google Account](https://myaccount.google.com/)
 2. Select **Security**
-3. Under “Signing in to Google” select **App Passwords**
-4. Sign in to your Account, and create a new App Password for Gmail.
-5. Then you can setup the intergation as below:
+3. Under “How you sign into Google” select **2-Step Verification**.
+4. Sign in to your Account.
+5. At the bottom of the 2-Step Verification page, click **App Passwords**.
+6. Give your app a name that makes sense to you (Home Assistant IMAP, for example).
+7. Click **Create**, then make a note of your 16-character app password for safekeeping (remove the spaces when you save it).
+8. Click **Done**.
+9. Add the IMAP Integration to your Home Assistant instance using the My button above.  Enter the following information as needed:
+
+    - Username: Your Gmail email login
+    - Password: your 16-character app password (without the spaces)
     - Server: `imap.gmail.com`
     - Port: `993`
-    - Username: Your full email address
-    - Password: The new app password
+
+10. Click **Submit**.
+11. Assign your integration to an "Area" if desired, then click **Finish**.
+
+Congratulations, you now how a sensor that counts the number of unread e-mails in your Gmail account.  From here you can create additional sensors based upon the data that comes through the event bus when there's a new message detected.
 
 ### Configuring IMAP Searches