diff --git a/src/app/shared/address-input/address-input.component.html b/src/app/shared/address-input/address-input.component.html
index 50f291661f..70bdaabdf1 100644
--- a/src/app/shared/address-input/address-input.component.html
+++ b/src/app/shared/address-input/address-input.component.html
@@ -16,6 +16,7 @@
       <app-ubs-input-error [formElement]="region"></app-ubs-input-error>
     </div>
   </div>
+
   <div class="col-md-6 col-sm-6 form-group">
     <label for="city">{{ 'personal-info.pop-up-city' | translate }}</label>
     <app-input-google-autocomplete
diff --git a/src/app/shared/search-popup/search-popup.component.ts b/src/app/shared/search-popup/search-popup.component.ts
index 0b92e90cd5..cecdc29151 100644
--- a/src/app/shared/search-popup/search-popup.component.ts
+++ b/src/app/shared/search-popup/search-popup.component.ts
@@ -1,18 +1,18 @@
 import { NewsSearchModel } from '@global-models/search/newsSearch.model';
 import { EventsSearchModel } from '@global-models/search/eventsSearch.model';
 import { LiveAnnouncer } from '@angular/cdk/a11y';
-import { searchIcons } from '../../main/image-pathes/search-icons';
-import { negate, isNil } from 'lodash';
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Observable, Subscription, forkJoin } from 'rxjs';
 import { FormControl } from '@angular/forms';
-import { debounceTime, distinctUntilChanged, tap, switchMap, filter } from 'rxjs/operators';
-import { SearchService } from '@global-service/search/search.service';
+import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBarComponent } from '@global-errors/mat-snack-bar/mat-snack-bar.component';
+import { PlacesSearchModel } from '@global-models/search/placesSearch.model';
 import { LocalStorageService } from '@global-service/localstorage/local-storage.service';
-import { MatDialog } from '@angular/material/dialog';
+import { SearchService } from '@global-service/search/search.service';
+import { isNil, negate } from 'lodash';
+import { debounceTime, distinctUntilChanged, filter, switchMap, tap } from 'rxjs/operators';
+import { searchIcons } from '../../main/image-pathes/search-icons';
 import { SearchCategory } from './search-consts';
-import { PlacesSearchModel } from '@global-models/search/placesSearch.model';
 import { PopupSearchResults } from './search-popup.model';
 
 @Component({
diff --git a/src/app/ubs/ubs/models/ubs.model.ts b/src/app/ubs/ubs/models/ubs.model.ts
index 4aeca3446f..9ca6841a0e 100644
--- a/src/app/ubs/ubs/models/ubs.model.ts
+++ b/src/app/ubs/ubs/models/ubs.model.ts
@@ -337,7 +337,15 @@ export class CAddressData {
 
   //Find required address component in google response by it's type
   //For example 'route' is a street name, 'street_number' is a house number
-  private findValue(response: google.maps.GeocoderResult, ...type: string[]): google.maps.GeocoderAddressComponent {
-    return response.address_components.find((component) => component.types.some((t) => type.includes(t)));
+  private findValue(response: google.maps.GeocoderResult, ...types: string[]): google.maps.GeocoderAddressComponent {
+    for (const type of types) {
+      const value = response.address_components.find((component) => component.types.some((t) => type === t));
+
+      if (value) {
+        return value;
+      }
+    }
+
+    return null;
   }
 }
diff --git a/src/app/ubs/ubs/validators/address-olready-exists-validator.ts b/src/app/ubs/ubs/validators/address-olready-exists-validator.ts
index 7ecbd6128b..092808ebd0 100644
--- a/src/app/ubs/ubs/validators/address-olready-exists-validator.ts
+++ b/src/app/ubs/ubs/validators/address-olready-exists-validator.ts
@@ -12,10 +12,13 @@ export function addressAlreadyExistsValidator(
         getLangValue(address.region, address.regionEn, currentLanguage) === group.controls?.region.value &&
         getLangValue(address.city, address.cityEn, currentLanguage) === group.controls?.city.value &&
         getLangValue(address.street, address.streetEn, currentLanguage) === group.controls?.street.value &&
-        address.district === group.controls?.district.value?.nameUa &&
         address.houseNumber === group.controls?.houseNumber.value &&
-        address.houseCorpus === group.controls?.houseCorpus.value &&
-        address.entranceNumber === group.controls?.entranceNumber.value
+        compareIfExist(group.controls?.houseCorpus.value, address.houseCorpus) &&
+        compareIfExist(group.controls?.entranceNumber.value, address.entranceNumber) &&
+        (address.district === group.controls?.district.value?.nameUa ||
+          address.districtEn === group.controls?.district.value?.nameEn ||
+          address.district === group.controls?.district.value ||
+          address.districtEn === group.controls?.district.value)
     );
 
     return isAlreadyExist ? { addressAlreadyExists: true } : null;
@@ -25,3 +28,11 @@ export function addressAlreadyExistsValidator(
 function getLangValue(valUA: any, valEN: any, currentLanguage: Language): any {
   return currentLanguage === Language.EN ? valEN : valUA;
 }
+
+function compareIfExist(value: any, compareTo: any): boolean {
+  if (!value) {
+    return true;
+  }
+
+  return value === compareTo;
+}