Another fix in is_valid_account_name
merge