diff --git a/salt_observer/migrations/0018_auto_20160722_1033.py b/salt_observer/migrations/0018_auto_20160722_1033.py
new file mode 100644
index 0000000000000000000000000000000000000000..c146629c7dd9d4c8fa89399bda722e01b14e2dbf
--- /dev/null
+++ b/salt_observer/migrations/0018_auto_20160722_1033.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-07-22 08:33
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('salt_observer', '0017_networkinterface_ip_address'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='domain',
+            name='md_content',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AlterField(
+            model_name='domain',
+            name='md_last_edited',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='minion',
+            name='md_content',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AlterField(
+            model_name='minion',
+            name='md_last_edited',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='network',
+            name='md_content',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AlterField(
+            model_name='network',
+            name='md_last_edited',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]
diff --git a/salt_observer/models.py b/salt_observer/models.py
index 2d320305ee828e35f415006974d4721694e01da6..9bf894acd86bc96cde773f566de2a7d8cba636dc 100644
--- a/salt_observer/models.py
+++ b/salt_observer/models.py
@@ -8,8 +8,8 @@ import requests
 class MarkdownContent(models.Model):
     ''' To enable on-the-fly modification of templates '''
 
-    md_content = models.TextField(blank=True)
-    md_last_edited = models.DateTimeField()
+    md_content = models.TextField(default='', blank=True)
+    md_last_edited = models.DateTimeField(blank=True, null=True)
     md_last_autor = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True)
 
     class Meta: