Thank you for your replies, I'll do that!
Yeah I understand, it is a nice feature, but in my case the users are even burdened by entering a UN/PW so an additional tenancy name will blow their minds.
Will the underlying architecture need an overhaul or is it simpler then that?