diff --git a/bot.sh b/bot.sh
index 7ec6521..28c43bb 100644
--- a/bot.sh
+++ b/bot.sh
@@ -43,7 +43,7 @@ do
       done 10< subscribers.txt
 
       while read -u 11 subscriber email_addr; do
-        sed -e "s/<dj>/$dj/g" -e "s/<link>/$link/g" dj-online-email.tmpl \
+        sed -e "s/<dj>/$dj/g" -e "s|<link>|$link|g" dj-online-email.tmpl \
           | sendmail $email_addr
       done 11< email-subscribers.txt
 
diff --git a/dj-online-email.tmpl b/dj-online-email.tmpl
index cbf6552..2cd5cec 100644
--- a/dj-online-email.tmpl
+++ b/dj-online-email.tmpl
@@ -1,3 +1,4 @@
+From: radiobot <radiobot@tilde.chat>
 Subject: tilderadio: dj <dj> is now streaming!
 
 <dj> just came on the air on tilderadio.org!