diff --git a/TIAMSharedUI/Pages/Components/EditComponents/EditAddressComponent.razor b/TIAMSharedUI/Pages/Components/EditComponents/EditAddressComponent.razor
index 0fa95812..9887231d 100644
--- a/TIAMSharedUI/Pages/Components/EditComponents/EditAddressComponent.razor
+++ b/TIAMSharedUI/Pages/Components/EditComponents/EditAddressComponent.razor
@@ -2,7 +2,7 @@
 @* @typeparam TModel *@
 <EditForm Context="EditFormContext" Model="@Model" OnValidSubmit="OnValidSubmit">
     <DxFormLayout>
-        <DxFormLayoutGroup ColCountMd="2">
+        <DxFormLayoutGroup ColSpanXs="12">
             <DxFormLayoutItem Caption="Address Text">
                 <DxTextBox @bind-Text="Model.AddressText" />
             </DxFormLayoutItem>
@@ -24,7 +24,7 @@
             <DxFormLayoutItem Caption="Modified">
                 <DxDateEdit @bind-Date="Model.Modified" ReadOnly="true" />
             </DxFormLayoutItem>            
-            <DxButton Context="ButtonContext" RenderStyle="ButtonRenderStyle.Primary" ButtonType="ButtonType.Submit">Save Changes</DxButton>
+            @* <DxButton Context="ButtonContext" RenderStyle="ButtonRenderStyle.Primary" ButtonType="ButtonType.Submit">Save Changes</DxButton> *@
         </DxFormLayoutGroup>
     </DxFormLayout>
 </EditForm>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
index 0e53138b..1b966272 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
@@ -18,7 +18,7 @@
 <div class="mb-2">
     Profile
 </div>
-<DxGrid Data="_detailGridData"
+<DxGrid @ref="Grid" Data="_detailGridData"
         PageSize="5"
         AutoExpandAllGroupRows="true"
         KeyboardNavigationEnabled="KeyboardNavigationEnabled"
@@ -58,9 +58,9 @@
     public object AddressContext { get; set; }
     [Parameter]
     public string ContextIdType { get; set; }
+    IGrid Grid { get; set; }
 
-
-    List<TIAM.Entities.Addresses.Address> _detailGridData;
+    List<TIAM.Entities.Addresses.Address> _detailGridData = new List<Address>();
 
     List<TIAM.Entities.Addresses.Address> _availableProfiles;
 
@@ -69,6 +69,7 @@
     public void SaveAddress(Address addressToSave)
     {
         
+        Grid.SaveChangesAsync();
     }
 
     protected override async Task OnInitializedAsync()
@@ -88,22 +89,32 @@
                 case ("userprofile"):
                     //get profile for user
                     UserModelDto resultData = (UserModelDto)AddressContext;
-                    _detailGridData.Add(resultData.UserDto.Profile.Address);
+                    if (resultData.UserDto.Profile.Address != null)
+                        _detailGridData.Add(resultData.UserDto.Profile.Address);
+                    break;
+                case ("userdetailprofile"):
+                    //get profile for user
+                    UserModelDtoDetail resultData2 = (UserModelDtoDetail)AddressContext;
+                    if (resultData2.UserDto.Profile.Address != null)
+                        _detailGridData.Add(resultData2.UserDto.Profile.Address);
                     break;
                 case ("productprofile"):
                     //get profile for user
-                    Product resultData2 = (Product)AddressContext;
-                    _detailGridData.Add(resultData2.Profile.Address);
+                    Product resultData3 = (Product)AddressContext;
+                    if (resultData3.Profile.Address != null)
+                        _detailGridData.Add(resultData3.Profile.Address);
                     break;
-                case ("companyProfile"):
+                case ("companyprofile"):
                     //get profile for user
-                    var resultData3 = (Company)AddressContext;
-                    _detailGridData.Add(resultData3.Profile.Address);
+                    var resultData4 = (Company)AddressContext;
+                    if (resultData4.Profile.Address != null)
+                        _detailGridData.Add(resultData4.Profile.Address);
                     break;
                 case ("transferdestination"):
                     //get address for transferDestination
-                    TransferDestination resultData4 = (TransferDestination)AddressContext;                     
-                    _detailGridData.Add(resultData4.Address);
+                    TransferDestination resultData5 = (TransferDestination)AddressContext; 
+                    if (resultData5.Address != null)
+                        _detailGridData.Add(resultData5.Address);
                     break;
                
             }
@@ -129,7 +140,7 @@
             //add new orderData to orderData array
             _logger.Info("Data added");
         else
-            _logger.Info("Data updated");
+            _logger.Info("Data updated: " + ((Address)e.EditModel).IsValid);
 
         await UpdateDataAsync();
     }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
index c7f37154..668001b6 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
@@ -1,5 +1,6 @@
 @page "/user/companies"
 @using AyCode.Core.Helpers
+@using AyCode.Utils.Extensions
 @using BlazorAnimation
 @using TIAM.Core.Enums
 @using TIAM.Entities.ServiceProviders
@@ -107,14 +108,18 @@
                             <DxGridDataColumn FieldName="OwnerId">
                                 <CellDisplayTemplate>
                                     @{
-                                        var keyField = context.Value;
-                                        Guid keyFieldValue = (Guid)keyField;
+                                        var keyField = context.Value as Guid?;
+                                        
                                         var keyItem = (Company)context.DataItem;
                                         string buttonText = "Set owner";
-                                        if(keyFieldValue == Guid.Empty)
+                                        if(keyField.IsNullOrEmpty())
                                         {                                            
                                             <DxButton Click="() => SetOwnerPopup(keyItem)" Text="@buttonText" RenderStyle="ButtonRenderStyle.Primary" />
                                         }
+                                        else
+                                        {                                        
+                                                <span>@keyField</span>
+                                        }
                                     }
                                 </CellDisplayTemplate>
                                 </DxGridDataColumn>
@@ -130,7 +135,7 @@
                             <CompaniesNestedUserProductMapping CurrentCompany="(TIAM.Entities.ServiceProviders.Company)context.DataItem" KeyboardNavigationEnabled="true" />
                         </DetailRowTemplate> *@
                         <DetailRowTemplate>
-                            <AddressGridComponent Context="(TIAM.Entities.ServiceProviders.Company)context.DataItem" KeyboardNavigationEnabled="true" />
+                            <AddressGridComponent AddressContext="(TIAM.Entities.ServiceProviders.Company)context.DataItem" ContextIdType="companyprofile" KeyboardNavigationEnabled="true" />
                         </DetailRowTemplate>
                         <EditFormTemplate Context="EditFormContext">
                             @{
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
index a97276c3..b3a96b9c 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
@@ -211,6 +211,12 @@
     public List<Transfer> TransferDataList { get; set; }
 
     bool PopupVisible { get; set; }
+
+
+    IGrid Grid2 { get; set; }
+    object MasterGridData { get; set; }
+    bool AutoCollapseDetailRow { get; set; }
+
     public List<string> IgnoreList =
     [
         "ReceiverEmailAddress",
@@ -483,9 +489,6 @@
         Grid2.ShowColumnChooser();
     }
 
-    IGrid Grid2 { get; set; }
-    object MasterGridData { get; set; }
-    bool AutoCollapseDetailRow { get; set; }
 
     protected override void OnAfterRender(bool firstRender)
     {
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
index 3aa1fb61..48aea7aa 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
@@ -108,6 +108,9 @@
                             <DetailRowTemplate>
                                 <UserGrid_MasterDetail_NestedGrid_UserProductMapping UserModelDtoDetail="(UserModelDtoDetail)context.DataItem" KeyboardNavigationEnabled="true" />
                             </DetailRowTemplate>
+                            <DetailRowTemplate>
+                                <AddressGridComponent AddressContext="(UserModelDtoDetail)context.DataItem" ContextIdType="userdetailprofile" KeyboardNavigationEnabled="true" />
+                            </DetailRowTemplate>
                             <EditFormTemplate Context="EditFormContext">
                                 @{
                                     var transfer2 = (UserModelDtoDetail)EditFormContext.EditModel;