Bugfix: override should now work properly
Enhanced auth shim to allow arbitrary usernames
Merge TODO