diff --git a/src/EmployerFinance/SFA.DAS.EmployerFinance.sln b/src/EmployerFinance/SFA.DAS.EmployerFinance.sln
index 3a1b2df1a5..91cfd6943c 100644
--- a/src/EmployerFinance/SFA.DAS.EmployerFinance.sln
+++ b/src/EmployerFinance/SFA.DAS.EmployerFinance.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31424.327
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34902.65
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFA.DAS.SharedOuterApi", "..\Shared\SFA.DAS.SharedOuterApi\SFA.DAS.SharedOuterApi.csproj", "{988FB7FC-2B13-4611-AB77-A1B16C964505}"
 EndProject
@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFA.DAS.EmployerFinance.Api
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFA.DAS.EmployerFinance.UnitTests", "SFA.DAS.EmployerFinance.UnitTests\SFA.DAS.EmployerFinance.UnitTests.csproj", "{EF8844A9-7309-4E8B-9306-8B4A805B5C7B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFA.DAS.SharedOuterApi.UnitTests", "..\Shared\SFA.DAS.SharedOuterApi.UnitTests\SFA.DAS.SharedOuterApi.UnitTests.csproj", "{9F5BF86B-5F9F-42FB-A2E2-7E5AF73618F7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{EF8844A9-7309-4E8B-9306-8B4A805B5C7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF8844A9-7309-4E8B-9306-8B4A805B5C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF8844A9-7309-4E8B-9306-8B4A805B5C7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F5BF86B-5F9F-42FB-A2E2-7E5AF73618F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F5BF86B-5F9F-42FB-A2E2-7E5AF73618F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F5BF86B-5F9F-42FB-A2E2-7E5AF73618F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F5BF86B-5F9F-42FB-A2E2-7E5AF73618F7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Shared/SFA.DAS.SharedOuterApi.UnitTests/Services/EmployerAccountsServiceTests/WhenGettingEmployerAccountsTests.cs b/src/Shared/SFA.DAS.SharedOuterApi.UnitTests/Services/EmployerAccountsServiceTests/WhenGettingEmployerAccountsTests.cs
index d25a212035..ca399b045e 100644
--- a/src/Shared/SFA.DAS.SharedOuterApi.UnitTests/Services/EmployerAccountsServiceTests/WhenGettingEmployerAccountsTests.cs
+++ b/src/Shared/SFA.DAS.SharedOuterApi.UnitTests/Services/EmployerAccountsServiceTests/WhenGettingEmployerAccountsTests.cs
@@ -103,6 +103,7 @@ public async Task Then_If_The_Id_Is_Not_A_Guid_Then_User_Account_IsNot_Found_The
             actual.TrueForAll(c => c.DisplayName.Equals(profileUserResponse.DisplayName)).Should().BeTrue();
             actual.TrueForAll(c => c.IsSuspended.Equals(profileUserResponse.IsSuspended)).Should().BeTrue();
         }
+
         [Test, MoqAutoData]
         public async Task Then_If_The_Id_Is_Not_A_Guid_And_A_Existing_User_With_Different_Email_Then_User_Upserted_And_User_Information_Returned(
             Guid userId,
@@ -189,9 +190,87 @@ public async Task Then_If_The_Id_Is_Not_A_Guid_And_A_New_User_With_No_Accounts_T
             actualRecord.DasAccountName.Should().BeNullOrEmpty();
             actualRecord.EncodedAccountId.Should().BeNullOrEmpty();
             actualRecord.Role.Should().BeNullOrEmpty();
-            
         }
-        
+
+        [Test, MoqAutoData]
+        public async Task Then_If_The_Id_Is_A_Guid_And_A_No_User_Name_With_No_Accounts_Then_User_Upserted_And_User_Information_Returned(
+             EmployerProfile employerProfile,
+             EmployerProfileUsersApiResponse profileUserResponse,
+             [Frozen] Mock<IEmployerProfilesApiClient<EmployerProfilesApiConfiguration>> employerProfilesApiClient,
+             [Frozen] Mock<IAccountsApiClient<AccountsConfiguration>> accountsApiClient,
+             EmployerAccountsService handler)
+        {
+            employerProfile.UserId = Guid.NewGuid().ToString();
+
+            accountsApiClient
+                .Setup(x => x.GetAll<GetUserAccountsResponse>(
+                    It.Is<GetUserAccountsRequest>(c => c.GetAllUrl.Contains($"user/{profileUserResponse.Id}/accounts"))))
+                .ReturnsAsync(new List<GetUserAccountsResponse>());
+            accountsApiClient
+                .Setup(x => x.GetAll<GetAccountTeamMembersResponse>(
+                    It.IsAny<GetAccountTeamMembersRequest>()))
+                .ReturnsAsync(new List<GetAccountTeamMembersResponse>());
+            employerProfilesApiClient.Setup(x => x.GetWithResponseCode<EmployerProfileUsersApiResponse>(
+                    It.Is<GetEmployerUserAccountRequest>(c =>
+                        c.GetUrl.Contains($"api/users/{HttpUtility.UrlEncode(employerProfile.UserId)}"))))
+                .ReturnsAsync(new ApiResponse<EmployerProfileUsersApiResponse>(null, HttpStatusCode.NotFound, "Not Found"));
+
+            var actual = (await handler.GetEmployerAccounts(employerProfile)).ToList();
+
+            actual.Count.Should().Be(1);
+            var actualRecord = actual.First();
+            actualRecord.UserId.Should().Be(employerProfile.UserId);
+            actualRecord.FirstName.Should().Be("Unknown");
+            actualRecord.LastName.Should().Be("Unknown");
+            actualRecord.IsSuspended.Should().BeFalse();
+            actualRecord.DasAccountName.Should().BeNullOrEmpty();
+            actualRecord.EncodedAccountId.Should().BeNullOrEmpty();
+            actualRecord.Role.Should().BeNullOrEmpty();
+        }
+
+        [Test, MoqAutoData]
+        public async Task Then_If_The_Id_Is_Not_A_Guid_And_A_No_User_Name_With_No_Accounts_Then_User_Upserted_And_User_Information_Returned(
+             EmployerProfile employerProfile,
+             EmployerProfileUsersApiResponse profileUserResponse,
+             [Frozen] Mock<IEmployerProfilesApiClient<EmployerProfilesApiConfiguration>> employerProfilesApiClient,
+             [Frozen] Mock<IAccountsApiClient<AccountsConfiguration>> accountsApiClient,
+             EmployerAccountsService handler)
+        {
+            employerProfile.LastName = null;
+            employerProfile.FirstName = null;
+            profileUserResponse.LastName = null;
+            profileUserResponse.FirstName = null;
+
+            accountsApiClient
+                .Setup(x => x.GetAll<GetUserAccountsResponse>(
+                    It.Is<GetUserAccountsRequest>(c => c.GetAllUrl.Contains($"user/{profileUserResponse.Id}/accounts"))))
+                .ReturnsAsync(new List<GetUserAccountsResponse>());
+            accountsApiClient
+                .Setup(x => x.GetAll<GetAccountTeamMembersResponse>(
+                    It.IsAny<GetAccountTeamMembersRequest>()))
+                .ReturnsAsync(new List<GetAccountTeamMembersResponse>());
+            employerProfilesApiClient.Setup(x => x.GetWithResponseCode<EmployerProfileUsersApiResponse>(
+                    It.Is<GetEmployerUserAccountRequest>(c =>
+                        c.GetUrl.Contains($"api/users/{HttpUtility.UrlEncode(employerProfile.UserId)}"))))
+                .ReturnsAsync(new ApiResponse<EmployerProfileUsersApiResponse>(null, HttpStatusCode.NotFound, "Not Found"));
+            employerProfilesApiClient.Setup(x => x.PutWithResponseCode<EmployerProfileUsersApiResponse>(
+                    It.Is<PutUpsertEmployerUserAccountRequest>(c =>
+                        c.PutUrl.Contains($"api/users/"))))
+                .ReturnsAsync(new ApiResponse<EmployerProfileUsersApiResponse>(profileUserResponse, HttpStatusCode.Created, ""));
+
+            var actual = (await handler.GetEmployerAccounts(employerProfile)).ToList();
+
+            actual.Count.Should().Be(1);
+            var actualRecord = actual.First();
+            actualRecord.UserId.Should().Be(profileUserResponse.Id);
+            actualRecord.FirstName.Should().Be("Unknown");
+            actualRecord.LastName.Should().Be("Unknown");
+            actualRecord.IsSuspended.Should().Be(profileUserResponse.IsSuspended);
+            actualRecord.DasAccountName.Should().BeNullOrEmpty();
+            actualRecord.EncodedAccountId.Should().BeNullOrEmpty();
+            actualRecord.Role.Should().BeNullOrEmpty();
+        }
+
         [Test, MoqAutoData]
         public async Task Then_If_The_Id_Is_A_Guid_Then_User_Account_Found_And_Not_Upserted(
             EmployerProfile employerProfile,
diff --git a/src/Shared/SFA.DAS.SharedOuterApi/Services/EmployerAccountsService.cs b/src/Shared/SFA.DAS.SharedOuterApi/Services/EmployerAccountsService.cs
index 1c29f4dd35..b0a5febdfe 100644
--- a/src/Shared/SFA.DAS.SharedOuterApi/Services/EmployerAccountsService.cs
+++ b/src/Shared/SFA.DAS.SharedOuterApi/Services/EmployerAccountsService.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using SFA.DAS.SharedOuterApi.Configuration;
 using SFA.DAS.SharedOuterApi.Infrastructure;
 using SFA.DAS.SharedOuterApi.InnerApi.Requests;
@@ -22,11 +23,13 @@ public class EmployerAccountsService : IEmployerAccountsService
     {
         private readonly IEmployerProfilesApiClient<EmployerProfilesApiConfiguration> _employerProfilesApiClient;
         private readonly IAccountsApiClient<AccountsConfiguration> _accountsApiClient;
+        private readonly ILogger<EmployerAccountsService> _logger;
 
-        public EmployerAccountsService(IEmployerProfilesApiClient<EmployerProfilesApiConfiguration> employerProfilesApiClient, IAccountsApiClient<AccountsConfiguration> accountsApiClient)
+        public EmployerAccountsService(IEmployerProfilesApiClient<EmployerProfilesApiConfiguration> employerProfilesApiClient, IAccountsApiClient<AccountsConfiguration> accountsApiClient, ILogger<EmployerAccountsService> logger)
         {
             _employerProfilesApiClient = employerProfilesApiClient;
             _accountsApiClient = accountsApiClient;
+            _logger = logger;
         }
 
         public async Task<IEnumerable<EmployerAccountUser>> GetEmployerAccounts(EmployerProfile employerProfile)
@@ -41,7 +44,6 @@ public async Task<IEnumerable<EmployerAccountUser>> GetEmployerAccounts(Employer
                 await _employerProfilesApiClient.GetWithResponseCode<EmployerProfileUsersApiResponse>(
                     new GetEmployerUserAccountRequest(employerProfile.UserId));
             
-            
             if (userResponse.StatusCode == HttpStatusCode.NotFound)
             {
                 if (!Guid.TryParse(employerProfile.UserId, out _))
@@ -56,6 +58,18 @@ await _employerProfilesApiClient.PutWithResponseCode<EmployerProfileUsersApiResp
                     lastName = employerUserResponse.Body.LastName;
                     displayName = employerUserResponse.Body.DisplayName;
                     isSuspended = employerUserResponse.Body.IsSuspended;
+
+                    // TODO Review this 
+                    // It is possible that the name is missing when this function is called,
+                    // this logging should help identify this
+                    _logger.LogInformation("UserId {0} added to Employer Profile:  Is Lastname blank {1}",
+                        employerProfile.UserId, string.IsNullOrWhiteSpace(lastName));
+                }
+                else
+                {
+                    // TODO Review this
+                    // It may be called when the if user id is a valid guid name will be blank
+                    _logger.LogInformation("UserId {0} is a guid: Lastname will be blank", employerProfile.UserId);
                 }
             }
             else
@@ -109,8 +123,8 @@ await _employerProfilesApiClient.PutWithResponseCode<EmployerProfileUsersApiResp
             {
                 returnList.Add(new EmployerAccountUser
                 {
-                    FirstName = firstName,
-                    LastName = lastName,
+                    FirstName = string.IsNullOrWhiteSpace(firstName) ? "Unknown" : firstName,
+                    LastName = string.IsNullOrWhiteSpace(lastName) ? "Unknown" : lastName,
                     UserId = userId,
                     DisplayName = displayName,
                     IsSuspended = isSuspended