diff --git a/avatar/migrations/0002_auto_20160722_0930.py b/avatar/migrations/0002_auto_20160722_0930.py
new file mode 100644
index 0000000..c5d234b
--- /dev/null
+++ b/avatar/migrations/0002_auto_20160722_0930.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.dev20160721154500 on 2016-07-22 09:30
+from __future__ import unicode_literals
+
+import avatar.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('avatar', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='avatar',
+            name='avatar',
+            field=avatar.models.AvatarField(),
+        ),
+    ]
diff --git a/avatar/models.py b/avatar/models.py
index 0d4d76b..9bbc876 100644
--- a/avatar/models.py
+++ b/avatar/models.py
@@ -71,13 +71,25 @@ def find_extension(format):
     return format
 
 
+class AvatarField(models.ImageField):
+
+    def __init__(self, *args, **kwargs):
+        super(AvatarField, self).__init__(*args, **kwargs)
+
+        self.max_length = 1024
+        self.upload_to = avatar_file_path
+        self.storage = avatar_storage
+        self.blank = True
+
+    def deconstruct(self):
+        name, path, args, kwargs = super(models.ImageField, self).deconstruct()
+        return name, path, (), {}
+
+
 class Avatar(models.Model):
     user = models.ForeignKey(getattr(settings, 'AUTH_USER_MODEL', 'auth.User'))
     primary = models.BooleanField(default=False)
-    avatar = models.ImageField(max_length=1024,
-                               upload_to=avatar_file_path,
-                               storage=avatar_storage,
-                               blank=True)
+    avatar = AvatarField()
     date_uploaded = models.DateTimeField(default=now)
 
     class Meta: