Resolve #3456738 "Combined bc fixes for break in login auth changes from #3444978"

Closes #3456738

Co-authored-by: Julian Pustkuchen <3110-Anybody@users.noreply.drupalcode.org>

core/modules/user/src/Controller/UserAuthenticationController.php

@@ -201,7 +201,7 @@ public function login(Request $request) {
         $authenticated = $this->userAuth->authenticateAccount($account, $credentials['pass']) ? $account->id() : FALSE;
       }
       else {
-        $authenticated = $this->userAuth->authenticateAccount($credentials['name'], $credentials['pass']);
+        $authenticated = $this->userAuth->authenticate($credentials['name'], $credentials['pass']);
       }
       if ($authenticated) {
         $this->userFloodControl->clear('user.http_login', $this->getLoginFloodIdentifier($request, $credentials['name']));