ACP2E-2212: Exception Error when trying to change Website in Customer > Company in Admin

Author: AnujNehra

app/code/Magento/Customer/Model/AccountManagement.php

@@ -923,11 +923,11 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         // Make sure we have a storeId to associate this customer with.
         if (!$customer->getStoreId()) {
             if ($customer->getWebsiteId()) {
+                $storeId = null;
                 $website = $this->storeManager->getWebsite($customer->getWebsiteId());
-                if ($website->getDefaultStore() === null) {
-                    throw new InputException(__('Store and store view is required for this website.'));
+                if ($website->getDefaultStore()) {
+                    $storeId = $website->getDefaultStore()->getId();
                 }
-                $storeId = $website->getDefaultStore()->getId();
             } else {
                 $this->storeManager->setCurrentStore(null);
                 $storeId = $this->storeManager->getStore()->getId();

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

@@ -2601,12 +2601,12 @@ public function testValidateCustomerStoreIdByWebsiteIdException(): void
 
     /**
      * @return void
-     * @throws InputException
+     * @throws LocalizedException
      */
     public function testCompanyAdminWebsiteDoesNotHaveStore(): void
     {
-        $this->expectException(InputException::class);
-        $this->expectExceptionMessage('Store and store view is required for this website.');
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('The store view is not in the associated website.');
 
         $websiteId = 1;
         $customerId = 1;
@@ -2617,7 +2617,7 @@ public function testCompanyAdminWebsiteDoesNotHaveStore(): void
             ->disableOriginalConstructor()
             ->getMock();
         $website->method('getStoreIds')
-            ->willReturn([1, 2, 3]);
+            ->willReturn([]);
         $website->expects($this->atMost(1))
             ->method('getDefaultStore')
             ->willReturn(null);