Clean up Multi User Selector

Needs testing