Add validation of the citizen_id back (but no more required)