Tweaking last changes: also check for 'username'.
Whitespace.