diff --git a/wger/exercises/templates/exercise/email_new.html b/wger/exercises/templates/exercise/email_new.html
index 57c6cf58a..248b5633e 100644
--- a/wger/exercises/templates/exercise/email_new.html
+++ b/wger/exercises/templates/exercise/email_new.html
@@ -6,4 +6,4 @@ added to workouts. You can access it on this address:{% endblocktrans %}
 {{url}}
 
 {% blocktrans %}Thank you for contributing and making this site better!{% endblocktrans %}
-   — {% blocktrans %}The {{ site_name }} team{% endblocktrans %}
+— {% blocktrans %}The {{ site }} team{% endblocktrans %}
diff --git a/wger/manager/management/commands/email-reminders.py b/wger/manager/management/commands/email-reminders.py
index f5bbbd3f1..ed70070e0 100644
--- a/wger/manager/management/commands/email-reminders.py
+++ b/wger/manager/management/commands/email-reminders.py
@@ -110,11 +110,10 @@ class Command(BaseCommand):
 
         # Compose and send the email
         translation.activate(user.userprofile.notification_language.short_name)
-        context = {}
-        context['site'] = Site.objects.get_current()
-        context['workout'] = workout
-        context['expired'] = True if delta.days < 0 else False
-        context['days'] = abs(delta.days)
+        context = {'site': Site.objects.get_current(),
+                   'workout': workout,
+                   'expired': True if delta.days < 0 else False,
+                   'days': abs(delta.days)}
 
         subject = _('Workout will expire soon')
         message = loader.render_to_string('workout/email_reminder.tpl', context)
diff --git a/wger/manager/templates/workout/email_reminder.tpl b/wger/manager/templates/workout/email_reminder.tpl
index 6eb6aa8d9..1f0252331 100644
--- a/wger/manager/templates/workout/email_reminder.tpl
+++ b/wger/manager/templates/workout/email_reminder.tpl
@@ -12,9 +12,9 @@ never produce reminders.{% endblocktrans %}
 {% blocktrans %}If you don't want to ever receive email reminders, deactivate the
 option in your settings.{% endblocktrans %}
 
-{% trans "the wger.de team" %}
+— {% blocktrans %}The {{ site }} team{% endblocktrans %}
 
 
 * https://{{site}}{{workout.get_absolute_url}}
 * https://{{site}}{% url 'manager:workout:add' %}
-* https://{{site}}{% url 'core:user:preferences' %}
\ No newline at end of file
+* https://{{site}}{% url 'core:user:preferences' %}
diff --git a/wger/manager/templates/workout/email_weight_reminder.tpl b/wger/manager/templates/workout/email_weight_reminder.tpl
index a4cc50caa..2364db66d 100644
--- a/wger/manager/templates/workout/email_weight_reminder.tpl
+++ b/wger/manager/templates/workout/email_weight_reminder.tpl
@@ -9,9 +9,9 @@ Please click the link to access the application and enter a new one.{% endblockt
 {% blocktrans %}If you don't want to ever receive email reminders, deactivate the
 option in your settings.{% endblocktrans %}
 
-{% trans "the wger.de team" %}
+— {% blocktrans %}The {{ site }} team{% endblocktrans %}
 
 
 * https://{{site}}{% url 'weight:overview' user.username %}
 * https://{{site}}{% url 'weight:add' %}
-* https://{{site}}{% url 'core:user:preferences' %}
\ No newline at end of file
+* https://{{site}}{% url 'core:user:preferences' %}
diff --git a/wger/nutrition/templates/ingredient/email_new.html b/wger/nutrition/templates/ingredient/email_new.html
index 7c2442806..8e410f46f 100644
--- a/wger/nutrition/templates/ingredient/email_new.html
+++ b/wger/nutrition/templates/ingredient/email_new.html
@@ -6,4 +6,4 @@ added to nutrition plans. You can access it on this address:{% endblocktrans %}
 {{url}}
 
 {% blocktrans %}Thank you for contributing and making this site better!{% endblocktrans %}
-   — {% blocktrans %}The {{ site_name }} team{% endblocktrans %}
+— {% blocktrans %}The {{ site }} team{% endblocktrans %}
diff --git a/wger/weight/management/commands/email-weight-reminder.py b/wger/weight/management/commands/email-weight-reminder.py
index 524c20e99..6e840e352 100644
--- a/wger/weight/management/commands/email-weight-reminder.py
+++ b/wger/weight/management/commands/email-weight-reminder.py
@@ -69,11 +69,10 @@ class Command(BaseCommand):
         # Compose and send the email
         translation.activate(user.userprofile.notification_language.short_name)
 
-        context = {}
-        context['site'] = Site.objects.get_current()
-        context['date'] = last_entry
-        context['days'] = datediff
-        context['user'] = user
+        context = {'site': Site.objects.get_current(),
+                   'date': last_entry,
+                   'days': datediff,
+                   'user': user}
 
         subject = _('You have to enter your weight')
         message = loader.render_to_string('workout/email_weight_reminder.tpl', context)