UsersGen: small logic change