Working out some bugs in authentication linking, username overrides and overall security.