Restore user-accounts to build
Finish re-adding user accounts
Fixes for user-accounts panel