Minor changes to the password checking and logging

These are some small very small changes we have had in production for a long time, found them during a rebase.