diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index 8369791d6b97afa68908f614481edc4f8e6f8fdf..6a991d53b94f128faca52e2aa178ae1258504d87 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -41,6 +41,11 @@ button {
   &.red {
     @include btn-red;
     border: none;
+    // user name ellipsis handling
+    white-space: nowrap;
+    width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 }
 
diff --git a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
index c0dce3bde1ab8159ffc5f239a98eff8203b1dec2..e04af8369835b9022f41bad9143b2c680460b379 100644
--- a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
+++ b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
@@ -20,9 +20,12 @@ export class AddressAutocompleteComponent implements OnInit {
 
   ngOnInit(): void {
     if (this.address) {
-      const address_str = this.address.numero
-        ? this.address.numero + ' '
-        : '' + this.address.street + ' ' + this.address.commune;
+      let address_str = null;
+      if (this.address.numero) {
+        address_str = this.address.numero + ' ' + this.address.street + ' ' + this.address.commune;
+      } else {
+        address_str = this.address.street + ' ' + this.address.commune;
+      }
       this.searchAddress.nativeElement.value = address_str;
     }
   }