Make recipient details required for combined mode also #6013