Bug fixes to add a federated user.