diff --git a/webadmin/src/views/email.js b/webadmin/src/views/email.js
index d82676ada..30bb428c1 100644
--- a/webadmin/src/views/email.js
+++ b/webadmin/src/views/email.js
@@ -129,7 +129,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             if (error) return console.error('Unable to get user listing.', error);
 
             // only allow users with a Cloudron email address
-            $scope.catchall.availableAddresses = result.filter(function (u) { return !!u.email; }).map(function (u) { return u.email; });
+            $scope.catchall.availableAddresses = result.filter(function (u) { return !!u.email; }).map(function (u) { return u.username; });
         });
     }