Merge pull request #135 from magento-commerce/magento2-login-as-customer/issues/134

magento2-login-as-customer/issues/134: Login as Customer not working if store view code is added to url.

Author: naydav

app/code/Magento/LoginAsCustomerUi/Controller/Adminhtml/Login/Login.php

@@ -146,10 +146,13 @@ public function execute(): ResultInterface
             return $resultRedirect->setPath('customer/index/index');
         }
 
-        $storeId = (int)$this->_request->getParam('store_id');
-        if (empty($storeId) && $this->config->isStoreManualChoiceEnabled()) {
-            $this->messageManager->addNoticeMessage(__('Please select a Store View to login in.'));
-            return $resultRedirect->setPath('customer/index/edit', ['id' => $customerId]);
+        $storeId = null;
+        if ($this->config->isStoreManualChoiceEnabled()) {
+            $storeId = (int)$this->_request->getParam('store_id');
+            if (empty($storeId)) {
+                $this->messageManager->addNoticeMessage(__('Please select a Store View to login in.'));
+                return $resultRedirect->setPath('customer/index/edit', ['id' => $customerId]);
+            }
         }
 
         $adminUser = $this->authSession->getUser();