solve embedded admins issues