diff --git a/client/homebrew/pages/vaultPage/vaultPage.jsx b/client/homebrew/pages/vaultPage/vaultPage.jsx
index 3b73f6807..fe6ff9736 100644
--- a/client/homebrew/pages/vaultPage/vaultPage.jsx
+++ b/client/homebrew/pages/vaultPage/vaultPage.jsx
@@ -393,12 +393,9 @@ const VaultPage = (props) => {
                     <span>{totalBrews}</span>
                 </span>
                 {brewCollection.map((brew, index) => {
-                    const processedAuthors = brew.authors.map(author =>
-                        author.includes('@') ? 'hidden' : author
-                    );
                     return (
                         <BrewItem
-                            brew={{ ...brew, authors: processedAuthors }}
+                            brew={{...brew}}
                             key={index}
                             reportError={props.reportError}
                         />
diff --git a/server/vault.api.js b/server/vault.api.js
index a652c5f93..b7db12699 100644
--- a/server/vault.api.js
+++ b/server/vault.api.js
@@ -68,11 +68,15 @@ const findBrews = async (req, res) => {
 		.maxTimeMS(5000)
 		.exec()
 		.then((brews) => {
-			console.log(
-				'Query in findBrews: ',
-				JSON.stringify(combinedQuery, null, 2)
-			);
-			res.json({ brews, page });
+			const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+
+			const processedBrews = brews.map((brew) => {
+				brew.authors = brew.authors.map(author =>
+					emailRegex.test(author) ? 'hidden' : author
+				);
+				return brew;
+			});
+			res.json({ brews: processedBrews, page });
 		})
 		.catch((error) => {
 			console.error(error);