Changed admin and administrator role check