DAIR modifications for admin user