diff --git a/bfps/_code.py b/bfps/_code.py
index fae02beb0512cc447183085199f6c03f93ca3f02..61b79fead383e4bddbf52c022e331f12ff39e3c3 100644
--- a/bfps/_code.py
+++ b/bfps/_code.py
@@ -389,7 +389,7 @@ class _code(_base):
 
         script_file.write('# @ node_usage = not_shared\n')
         script_file.write('# @ notification = complete\n')
-        script_file.write('# @ notify_user = $(user)@rzg.mpg.de\n')
+        script_file.write('# @ notify_user = {0}\n'.format(self.host_info['mail_address'])
 
         nb_cpus_per_node = self.host_info['deltanprocs']
         assert isinstance(nb_cpus_per_node, int) and \
@@ -484,6 +484,9 @@ class _code(_base):
         assert(type(self.host_info['environment']) != type(None))
         script_file.write('# @ class = {0}\n'.format(self.host_info['environment']))
         script_file.write('# @ node_usage = not_shared\n')
+
+        script_file.write('# @ notification = error\n')
+        script_file.write('# @ notify_user = {0}\n'.format(self.host_info['mail_address'])
         script_file.write('#\n')
 
         nb_cpus_per_node = self.host_info['deltanprocs']