Moved the switch user under the admin menu and tweaked the interaction.