Improve switch user dialog