diff --git a/smash/web/migrations/0113_auto_20180608_1258.py b/smash/web/migrations/0113_auto_20180608_1258.py
new file mode 100644
index 0000000000000000000000000000000000000000..17ce67819f1f2c2598e1f320cb4fe51a6c7f74d7
--- /dev/null
+++ b/smash/web/migrations/0113_auto_20180608_1258.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-06-08 12:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('web', '0112_auto_20180604_1021'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mailtemplate',
+            name='language',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='web.Language'),
+        ),
+    ]
diff --git a/smash/web/models/mail_template.py b/smash/web/models/mail_template.py
index 2089ae1ecf52516051ec5f189ec78ae60576eca3..f80b0e554c27f31bb61e72026edc98c05fc678b4 100644
--- a/smash/web/models/mail_template.py
+++ b/smash/web/models/mail_template.py
@@ -118,7 +118,7 @@ class MailTemplate(models.Model):
 
     name = models.CharField(max_length=255)
     context = models.CharField(max_length=1, choices=MAIL_TEMPLATE_CONTEXT_CHOICES)
-    language = models.ForeignKey("web.Language", on_delete=models.CASCADE, null=True)
+    language = models.ForeignKey("web.Language", on_delete=models.CASCADE, blank=True, null=True)
     template_file = models.FileField(upload_to='templates/')
 
     @staticmethod
diff --git a/smash/web/views/mails.py b/smash/web/views/mails.py
index 32a1f3b0413c30a7eb6f36825f06dda8ba805e68..047e6bafaf6c231ab1979b407efa0f551238c963 100644
--- a/smash/web/views/mails.py
+++ b/smash/web/views/mails.py
@@ -50,11 +50,6 @@ class MailTemplatesCreateView(CreateView, WrappedView):
     success_url = reverse_lazy('web.views.mail_templates')
     success_message = "Template created"
 
-    def get_form(self, form_class=None):
-        form = super(MailTemplatesCreateView, self).get_form(form_class)
-        form.fields['language'].required = False
-        return form
-
 
 class MailTemplatesDeleteView(DeleteView, WrappedView):
     model = MailTemplate