Added masquerading and admin toggle