Edits to Federated Identity (REBASE AWAY)