Efficiency tweaks, added comments

We don't need the first letter of the username if we're not in
Trusted Mode.