revert uaa/login back to 1 instance

[finishes #50333535]