Make country field requried and add countries choices