diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
index 236211ce..329c19e4 100644
--- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
@@ -525,7 +525,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
             {
                 ZipCode = company.ZipCode.Trim(),
                 StreetName = company.Address1[..pos1].Trim(),
-                HouseNumber = company.Address1.Split('-')[0]
+                HouseNumber = company.Address1.Split(' ')[1].Split('-')[0]
             };
         }
         /*
@@ -538,7 +538,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
             {
                 ZipCode = company.ZipCode.Trim(),
                 StreetName = company.Address2[..pos2].Trim(),
-                HouseNumber = company.Address2.Split('-')[0]
+                HouseNumber = company.Address2.Split(' ')[1].Split('-')[0]
             };
         }
         /*