Merge "Fix the argument check for account-generator"