diff --git a/avatar/migrations/0003_auto_20170827_1345.py b/avatar/migrations/0003_auto_20170827_1345.py
new file mode 100644
index 0000000..c85e774
--- /dev/null
+++ b/avatar/migrations/0003_auto_20170827_1345.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-27 13:45
+from __future__ import unicode_literals
+
+import avatar.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('avatar', '0002_add_verbose_names_to_avatar_fields'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='avatar',
+            name='avatar',
+            field=avatar.models.AvatarField(),
+        ),
+    ]
diff --git a/avatar/models.py b/avatar/models.py
index d243200..ddf1ff3 100644
--- a/avatar/models.py
+++ b/avatar/models.py
@@ -72,6 +72,21 @@ 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'),
@@ -81,12 +96,8 @@ class Avatar(models.Model):
         verbose_name=_("primary"),
         default=False,
     )
-    avatar = models.ImageField(
-        verbose_name=_("avatar"),
-        max_length=1024,
-        upload_to=avatar_file_path,
-        storage=avatar_storage,
-        blank=True,
+    avatar = AvatarField(
+        verbose_name=_("avatar")
     )
     date_uploaded = models.DateTimeField(
         verbose_name=_("uploaded at"),