diff --git a/djangoldp_notification/models.py b/djangoldp_notification/models.py
index 02ade0a..61c5aac 100644
--- a/djangoldp_notification/models.py
+++ b/djangoldp_notification/models.py
@@ -136,7 +136,7 @@ def send_email_on_notification(sender, instance, created, **kwargs):
         html_message = loader.render_to_string(
             'email.html',
             {
-                'on': settings.JABBER_DEFAULT_HOST,
+                'on': (settings.INSTANCE_DEFAULT_CLIENT or settings.JABBER_DEFAULT_HOST),
                 'instance': instance,
                 'author': who,
                 'object': where
@@ -144,7 +144,7 @@ def send_email_on_notification(sender, instance, created, **kwargs):
         )
 
         send_mail(
-            'Notification on ' + settings.JABBER_DEFAULT_HOST,
+            'Notification on ' + (settings.INSTANCE_DEFAULT_CLIENT or settings.JABBER_DEFAULT_HOST),
             instance.summary,
             settings.EMAIL_HOST_USER or "noreply@" + settings.JABBER_DEFAULT_HOST,
             [instance.user.email],