Marc Köhlbrugge
Fix masquerading of users without a username #wip