diff --git a/kaehmy/views.py b/kaehmy/views.py
index e0a05f3..fa65557 100644
--- a/kaehmy/views.py
+++ b/kaehmy/views.py
@@ -123,7 +123,7 @@ def submit(request, *args, **kwargs):
         application = form.save()
         custom_name = form.cleaned_data.get("custom_role_name")
         custom_is_board = form.cleaned_data.get("custom_role_is_board")
-        kaehmybot_allowed = form.cleaned_data.get("kaehmybot")
+        kaehmybot_allowed = form.cleaned_data.get("kaehmybot") == "1"
 
         if len(custom_name) > 0:
             custom_role = CustomRole(name=custom_name, is_board=custom_is_board)
@@ -142,7 +142,7 @@ def submit(request, *args, **kwargs):
         send_email(to=to_email, subject=subject, body=message, html=True)
         logging.debug(f"Sent kaehmy email to recipient <{to_email}>")
 
-        if kaehmybot_allowed or custom_is_board:
+        if kaehmybot_allowed:
             processHooks(
                 message=f"Uusi New kaehmy! {name} -> {url}", eventType="kaehmy"
             )
diff --git a/templates/webapp/signup_email.html b/templates/webapp/signup_email.html
index ad6c192..5b2334f 100644
--- a/templates/webapp/signup_email.html
+++ b/templates/webapp/signup_email.html
@@ -6,4 +6,4 @@
 
 <a href={{ url }}>{{url}}</a>
 
-<p>Hädässä ota yhteyttä hallitus@sahkoinsinoorikilta.fi</p>
+<p>Hädässä ota yhteyttä tapahtuman järjestään.</p>