diff --git a/ispconfig3_autoselect/ispconfig3_autoselect.php b/ispconfig3_autoselect/ispconfig3_autoselect.php
index a382e96..d1f9186 100644
--- a/ispconfig3_autoselect/ispconfig3_autoselect.php
+++ b/ispconfig3_autoselect/ispconfig3_autoselect.php
@@ -73,7 +73,7 @@ private function getHost($user)
             $mail_user = $this->soap->mail_user_get($session_id, ['login' => $user]);
             // Alternatively also search the email field, this can differ from the login field for legacy reasons
             if (empty($mail_user)) {
-                $mail_user = $this->soap->mail_user_get($session_id, ['email' => $this->rcmail->user->data['username']]);
+                $mail_user = $this->soap->mail_user_get($session_id, ['email' => $user]);
             }
 
             if (count($mail_user) == 1) {