Fixed some issues around the admin property not being set properly for non-admins, which resulted in admin buttons showing up for non-admins.