diff --git a/src/components/CitizenSummaryViewer.vue b/src/components/CitizenSummaryViewer.vue
index 44c8a96..6fbb762 100644
--- a/src/components/CitizenSummaryViewer.vue
+++ b/src/components/CitizenSummaryViewer.vue
@@ -176,9 +176,9 @@ function checkMissingRequiredFields(value: Partial<Citizen> | null) {
 		uf: citizen['uf'],
 	};
 
-	const missingCpfAndCnsFields = ['cpf', 'cns'].some(
-		field => isEmptyValue(citizen[field]) && !props.hiddenFields.includes(field)
-	);
+	const missingCpfField = isEmptyValue(citizen['cpf']) && !props.hiddenFields.includes('cpf');
+	const missingCnsField = isEmptyValue(citizen['cns']) && !props.hiddenFields.includes('cns');
+	const missingCpfAndCnsFields = missingCpfField && missingCnsField;
 
 	const missingCitizenFields = ['name', 'birth_date', 'mother_name', 'race'].some(
 		field => isEmptyValue(citizen[field]) && !props.hiddenFields.includes(field)
diff --git a/src/components/EditCitizenSidesheet.vue b/src/components/EditCitizenSidesheet.vue
index 7181a64..6b14b92 100644
--- a/src/components/EditCitizenSidesheet.vue
+++ b/src/components/EditCitizenSidesheet.vue
@@ -77,7 +77,7 @@ async function updateCitizen(formData: UpdateCitizenParams) {
 		return;
 	}
 
-	citizenService.update(formData)
+	citizenService.update(formData, props.citizen)
 		.then((citizen) => {
 			emits('success', citizen);
 			// @ts-ignore
diff --git a/src/components/InternalComponents/CitizenForm.vue b/src/components/InternalComponents/CitizenForm.vue
index c526b62..ec2dd83 100644
--- a/src/components/InternalComponents/CitizenForm.vue
+++ b/src/components/InternalComponents/CitizenForm.vue
@@ -330,7 +330,7 @@ async function handleCitySelect(cityName: string) {
 async function handleNeighborhoodSelect(neighborhood: { id: string, value: string }) {
 	isLoadingStreets.value = true;
 	const neighborhoodCityUfObject = {
-		neighborhood_name: neighborhood.value.toLowerCase(), 
+		neighborhood_name: neighborhood.value, 
 		city: formRef.value?.values.city.value,
 		uf: formRef.value?.values.uf.shortName,
 	}
diff --git a/src/models/Citizen.ts b/src/models/Citizen.ts
index 40c36f7..485c71d 100644
--- a/src/models/Citizen.ts
+++ b/src/models/Citizen.ts
@@ -53,7 +53,14 @@ export class Citizen {
 		this.issuing_agency = args.issuing_agency;
 
 		if (!args.address) {
-			this.address = new AddressModel({});
+			this.address = {
+				city: args.city,
+				uf: args.uf,
+				street: args.street,
+				neighborhood: args.neighborhood,
+				number: args.number,
+				complement: args.complement,
+			};
 			return;
 		}
 
diff --git a/src/services/citizen/citizen.service.ts b/src/services/citizen/citizen.service.ts
index c5b769f..149d875 100644
--- a/src/services/citizen/citizen.service.ts
+++ b/src/services/citizen/citizen.service.ts
@@ -73,7 +73,7 @@ export class CitizenService {
 		}
 	}
 
-	async update(data: UpdateCitizenParams): Promise<CreateCitizenResponse> {
+	async update(data: UpdateCitizenParams, document?: string): Promise<CreateCitizenResponse> {
 		if (!isCustomEndpointSet('update')) {
 			await this.delay(1000);
 			return this.citizenUpdateMock(data);
@@ -87,7 +87,7 @@ export class CitizenService {
 			const response = await this.apiCall('update', {
 				data,
 				method: 'put',
-				id: resolvedDocument,
+				id: document ?? resolvedDocument,
 			});
 
 			return response;