In my readings I always get the impression that one needs to follow the
thunderbird instructions and then also the command-line option.

By centralizing the email characteristics/requirements at the top, I can
remove some of the detailed and repeated instructions in each option.

howto/ldap.md

@@ -52,32 +52,41 @@ The email forward can also be changed in the [web interface][db.torproject.org].
 
 ## Password reset
 
-If you have lost or forgotten your LDAP password, you can have it reset by
-sending a PGP signed message to the mail gateway.
+If you have lost or forgotten your LDAP password or if you are are newly hired
+by TPI (congratulations!) and don't know your password yet, you can have it
+reset by sending a PGP signed message to the mail gateway.
 
-If you use Thunderbird and use it to manage your OpenPGP key, compose a new
-plain text (not HTML) message to `chpasswd@db.torproject.org`, enter any subject
-line and write this in the message body:
+The email should:
 
-    Please change my Tor password
+* be sent to `chpasswd@db.torproject.org`
+* be composed in plain text (not HTML)
+* be PGP signed by your key
+* have exactly (and just) this text as the message body: `Please change my Tor
+  password`
+
+If you use Thunderbird and use it to manage your OpenPGP key, compose a new
+message in plain text (not HTML). You can configure sending emails in plaintext
+in your account settings, or if your new messages are usually composed in HTML
+you can hold the Shift key while clicking on the "+ New Message" button. Enter
+any subject line and write the message body described above in the message body.
 
 Before sending the email, open the OpenPGP drop-down menu at the top of the
 compose window and click `Digitally Sign`.
 
-If you use GnuPG, send an (inline!) signed OpenPGP email to
-`chpasswd@db.torproject.org` to reset your password.
-
-A command like this, in a UNIX shell, would do it:
+_Or_, you use GnuPG directly and then send an (inline!) email with your client of
+choice. A command like the following, in a UNIX shell, will create the signed
+text that you can copy-paste in your email. Make sure to avoid double-signing
+the email and sending it in clear text (instead of HTML):
 
     echo "Please change my Tor password" | gpg --armor --sign
 
-Then copy-paste that in your email client, making sure to avoid
-double-signing the email and sending in clear text (instead of HTML).
-
-The daemon will then respond with a new randomized password encrypted with your
-key. Then use the [update form](https://db.torproject.org/login.html) to change
-your password to a strong password you can remember or (preferably) a stronger
-password stored in your password manager.
+However you sent your signed email, the daemon will then respond with a new
+randomized password encrypted with your key. You can then use the [update
+form](https://db.torproject.org/login.html) whit your new password to change
+your password to a strong password in the "Change password" field you can
+remember or (preferably) a stronger password stored in your password manager.
+Note: on that login page the button you should use to login is, unintuitively,
+labeled "Update my info"
 
 You cannot set a new password via the mail gateway.