diff --git a/core/migrations/0002_auto_20151215_0827.py b/core/migrations/0002_auto_20151215_0827.py
new file mode 100644
index 00000000..567c17c5
--- /dev/null
+++ b/core/migrations/0002_auto_20151215_0827.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='date_joined',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='date joined'),
+        ),
+    ]
diff --git a/core/models.py b/core/models.py
index 09eebfa0..f1ccf084 100644
--- a/core/models.py
+++ b/core/models.py
@@ -60,7 +60,7 @@ class User(AbstractBaseUser, PermissionsMixin):
             'Unselect this instead of deleting accounts.'
         ),
     )
-    date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
+    date_joined = models.DateTimeField(_('date joined'), auto_now_add=True)
     owner_group = models.ForeignKey(Group, related_name="owned_user",
                                     default=settings.AE_GROUPS['root']['id'])
     edit_group = models.ManyToManyField(Group, related_name="editable_user", blank=True)