diff --git a/SMTP-Configuration.md b/SMTP-Configuration.md
index af044c1..ffa6354 100644
--- a/SMTP-Configuration.md
+++ b/SMTP-Configuration.md
@@ -72,7 +72,7 @@ By default the machine's hostname is used as the hostname in the HELO command. T
 
 ### Google/Gmail
 You need to generate a App Password for Vaultwarden to work with Gmail.<br>
-Follow the steps here: https://support.google.com/accounts/answer/185833?hl=en&ref_topic=7189145 <br>
+Follow the steps here: https://support.google.com/accounts/answer/185833?hl=en&ref_topic=7189145 (unavailable since 5/30/2022)<br>
 In the end you well be shown a password (with spaces in between which are not there, it is just for easy type-over), use this password.<br>
 
 > [!NOTE]
@@ -85,12 +85,18 @@ FullSSL:
   SMTP_HOST=smtp.gmail.com
   SMTP_PORT=465
   SMTP_SECURITY=force_tls
-  SMTP_FROM=<vaultwarden@domain.tld>
-  SMTP_USERNAME=<mail-address-for-app-password>
+  SMTP_USERNAME=<mail-address>
+  SMTP_PASSWORD=<less-secure-app-password>
+```
+StartTLS:
+```ini
+  # Domains: gmail.com, googlemail.com
+  SMTP_HOST=smtp.gmail.com
+  SMTP_PORT=587
+  SMTP_SECURITY=starttls
+  SMTP_USERNAME=<mail-address>
   SMTP_PASSWORD=<less-secure-app-password>
 ```
-StartTLS: change the `SMTP_PORT` to `587` and the `SMTP_SECURITY` to `starttls`
-
 Also see: https://web.archive.org/web/20210925161633/https://webewizard.com/2019/09/17/Using-Lettre-With-Gmail/
 
 ### Hotmail/Outlook/Office365