GuardUsersOperation fix Autodetect refactoring