Make smtp-user field backward-compatible