Split the --user delimiter skipping across two lines and add comments.