service/email.md

@@ -453,18 +453,29 @@ password](#resetting-another-user-mail-password) instructions.
 ## New user onboarding
 
 When onboarding new folks onto email, it is often necessary to hold
-their hand a little bit. Follow this checklist:
+their hand a little bit.
 
-- if not already done, reset their LDAP password. then set a new email
-  password
+### Thunderbird and PGP setup
+
+This guide is for advanced users who will be using PGP:
+
+- if not already done, reset their LDAP password or [create a new LDAP account](howto/create-a-new-user)
+- set a new email password
 - if they use Thunderbird for emails, set a primary password (in order
   to keep their imported PGP key stored as encrypted)
 - import their PGP private key into thunderbird
 - configure thunderbird to send emails via Tor's server
 - test sending an email to your address
 - verify that they were able to obtain access to Gitlab and Nextcloud.
+
 If not, help them get access by resetting their password.
 
+### Non-PGP / gmail setup
+
+This guide is for more "beginner" users who will *not* use PGP. In
+that case, follow the [create a new user without a PGP key guide](howto/create-a-new-user#creating-a-user-without-a-pgp-key)
+guide.
+
 ## Resetting another user mail password
 
 To set a new password by hand in LDAP, you can use `doveadm` to