Don't output a "username" header if we have no usernames

Also changes the "no-usernames" header to match the "usernames" one more closely
Output the username while the password is being decrypted