diff --git a/src/kernel/faction.c b/src/kernel/faction.c
index d3e3bc014..de9ba6ed1 100755
--- a/src/kernel/faction.c
+++ b/src/kernel/faction.c
@@ -126,7 +126,13 @@ faction *get_or_create_monsters(void)
     if (!f) {
         const race *rc = rc_find("dragon");
             
-        f = addfaction("noreply@eressea.de", NULL, rc, NULL, 0);
+        const char *email = get_param(global.parameters, "monster.email");
+        if (email) {
+            f = addfaction(email, NULL, rc, NULL, 0);
+        } 
+        else {
+            f = addfaction("noreply@eressea.de", NULL, rc, NULL, 0);
+        }
         renumber_faction(f, 666);
         faction_setname(f, "Monster");
         f->options = 0;
@@ -340,7 +346,7 @@ void destroyfaction(faction * f)
                     if (rc->ec_flags & ECF_REC_HORSES) {  /* Zentauren an die Pferde */
                         h += u->number;
                     }
-                    else {              /* Orks zählen nur zur Hälfte */
+                    else {              /* Orks zählen nur zur Hälfte */
                         p += (int)(u->number * rc->recruit_multi);
                     }
                     for (itm = u->items; itm; itm = itm->next) {
@@ -365,7 +371,7 @@ void destroyfaction(faction * f)
         group *g;
         ally *sf, *sfn;
 
-        /* Alle HELFE für die Partei löschen */
+        /* Alle HELFE für die Partei löschen */
         for (sf = ff->allies; sf; sf = sf->next) {
             if (sf->faction == f) {
                 removelist(&ff->allies, sf);