diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
index 39c8e8c..2d739ea 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
@@ -81,7 +81,7 @@
 
     @Override
     public boolean isGenericAddress(Account.Id fromId) {
-      return from(fromId) != srvAddr;
+      return false;
     }
 
     @Override
@@ -130,13 +130,7 @@
 
     @Override
     public boolean isGenericAddress(Account.Id fromId) {
-      if (fromId != null) {
-        final Account account = accountCache.get(fromId).getAccount();
-        final String name = account.getFullName();
-        return name == null || "".equals(name);
-      } else {
-        return true;
-      }
+      return false;
     }
 
     @Override