diff --git a/bubble-server/src/main/java/bubble/cloud/email/mock/MockEmailDriver.java b/bubble-server/src/main/java/bubble/cloud/email/mock/MockEmailDriver.java
index c3cac623..3adbda82 100644
--- a/bubble-server/src/main/java/bubble/cloud/email/mock/MockEmailDriver.java
+++ b/bubble-server/src/main/java/bubble/cloud/email/mock/MockEmailDriver.java
@@ -7,13 +7,12 @@ package bubble.cloud.email.mock;
 import bubble.cloud.email.SmtpEmailDriver;
 import org.cobbzilla.mail.sender.SmtpMailSender;
 
-import static org.cobbzilla.util.daemon.ZillaRuntime.empty;
-
 public class MockEmailDriver extends SmtpEmailDriver {
 
     private static final MockMailSender MOCK_MAIL_SENDER = new MockMailSender();
 
     @Override public SmtpMailSender getSender() { return MOCK_MAIL_SENDER; }
 
-    @Override protected boolean isServiceCompatible(final String serviceHost) { return empty(serviceHost); }
+    @Override protected boolean isServiceCompatible(final String serviceHost) { return true; }
+
 }
diff --git a/bubble-server/src/main/java/bubble/cloud/email/sendgrid/SendgridSmtpEmailDriver.java b/bubble-server/src/main/java/bubble/cloud/email/sendgrid/SendgridEmailDriver.java
similarity index 98%
rename from bubble-server/src/main/java/bubble/cloud/email/sendgrid/SendgridSmtpEmailDriver.java
rename to bubble-server/src/main/java/bubble/cloud/email/sendgrid/SendgridEmailDriver.java
index f118bee5..e7d33814 100644
--- a/bubble-server/src/main/java/bubble/cloud/email/sendgrid/SendgridSmtpEmailDriver.java
+++ b/bubble-server/src/main/java/bubble/cloud/email/sendgrid/SendgridEmailDriver.java
@@ -35,7 +35,7 @@ import static org.cobbzilla.wizard.model.IdentifiableBase.DEFAULT_SHORT_ID_LENGT
 /**
  * Only to be used with Sendgrid account with Subusers supported!
  */
-public class SendgridSmtpEmailDriver extends SmtpEmailDriver {
+public class SendgridEmailDriver extends SmtpEmailDriver {
 
     public static final String SENDGRID_SMTP = "smtp.sendgrid.net";
     public static final String SG_API_BASE = "https://api.sendgrid.com/v3/";