diff --git a/webui/model/user/auth.php b/webui/model/user/auth.php
index 032c9160..8e7579fa 100644
--- a/webui/model/user/auth.php
+++ b/webui/model/user/auth.php
@@ -707,7 +707,10 @@ public function get_mailcow_userinfo($username = '') {
             continue;
          }
 
-         array_push($emails, strtolower($alias['address']));
+         // Ensure only aliases assigned to the user are added
+         if(isset($alias['goto']) && stripos($alias['goto'], $username) !== false) {
+             array_push($emails, strtolower($alias['address']));
+         }
 
          //syslog(LOG_INFO, 'mailcow alias: ' . $alias['address']);
       }