Added conditions to fireAdminEvent #1