diff --git a/mutalyzer/Scheduler.py b/mutalyzer/Scheduler.py
index 339d1ef55ff2db604597390f2b1274e071ad2143..96db9f0799c42728d35be685f174c82ddd310fe8 100644
--- a/mutalyzer/Scheduler.py
+++ b/mutalyzer/Scheduler.py
@@ -98,9 +98,9 @@ class Scheduler() :
         if settings.TESTING:
             return
 
-        # Mail is set to '<IP ADDRESS>@webservice' if the batch job was
-        # submitted using the webservice without specifying an email address.
-        if mailTo.endswith('@webservice'):
+        # Mail is set to '<IP ADDRESS>@<INTERFACE>.mutalyzer' if the batch job
+        # was submitted without specifying an email address.
+        if mailTo.endswith('.mutalyzer'):
             return
 
         #TODO: Handle Connection errors in a try, except clause
diff --git a/mutalyzer/services/rpc.py b/mutalyzer/services/rpc.py
index 3d3570ed69fb62484bc270d55e6b2508c5fba4db..4c9e5fdf7cc3b9e78499b7446c5d39607263353e 100644
--- a/mutalyzer/services/rpc.py
+++ b/mutalyzer/services/rpc.py
@@ -155,7 +155,7 @@ class MutalyzerService(ServiceBase):
                 address = unicode(ctx.transport.req_env['REMOTE_ADDR'])
             except (AttributeError, KeyError):
                 address = 'localhost'
-            email = '%s@webservice' % address
+            email = '%s@webservice.mutalyzer' % address
 
         result_id = scheduler.addJob(email, job, columns,
                                      batch_types[process], argument)
diff --git a/mutalyzer/website/views.py b/mutalyzer/website/views.py
index 1786c20142a2cfd846acddba5aa0397befe523c3..f3814c31005c6c035ffb8c0afebdc15cb9696f7f 100644
--- a/mutalyzer/website/views.py
+++ b/mutalyzer/website/views.py
@@ -907,7 +907,7 @@ def batch_jobs_submit():
     errors = []
 
     if not email:
-        email = '{}@webservice'.format(request.remote_addr)
+        email = '{}@website.mutalyzer'.format(request.remote_addr)
 
     if job_type not in BATCH_JOB_TYPES:
         errors.append('Invalid batch job type.')