diff --git a/oidc_provider/migrations/0018_auto_20160908_1627.py b/oidc_provider/migrations/0018_auto_20160908_1627.py
deleted file mode 100644
index 9d9cc7b..0000000
--- a/oidc_provider/migrations/0018_auto_20160908_1627.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2016-09-08 16:27
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('oidc_provider', '0017_auto_20160811_1954'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='client',
-            name='response_type',
-            field=models.CharField(choices=[(b'code', b'code (Authorization Code Flow)'), (b'id_token', b'id_token (Implicit Flow)'), (b'id_token token', b'id_token token (Implicit Flow)'), (b'code token', b'code token (Hybrid Flow)'), (b'code id_token', b'code id_token (Hybrid Flow)'), (b'code id_token token', b'code id_token token (Hybrid Flow)')], max_length=30, verbose_name='Response Type'),
-        ),
-    ]
diff --git a/oidc_provider/migrations/0018_hybridflow_and_clientattrs.py b/oidc_provider/migrations/0018_hybridflow_and_clientattrs.py
new file mode 100644
index 0000000..c915cf8
--- /dev/null
+++ b/oidc_provider/migrations/0018_hybridflow_and_clientattrs.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-12 14:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oidc_provider', '0017_auto_20160811_1954'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='client',
+            name='contact_email',
+            field=models.CharField(blank=True, default='', max_length=255, verbose_name='Contact Email'),
+        ),
+        migrations.AddField(
+            model_name='client',
+            name='logo',
+            field=models.FileField(blank=True, default='', upload_to='oidc_provider/clients', verbose_name='Logo Image'),
+        ),
+        migrations.AddField(
+            model_name='client',
+            name='terms_url',
+            field=models.CharField(blank=True, default='', help_text='External reference to the privacy policy of the client.', max_length=255, verbose_name='Terms URL'),
+        ),
+        migrations.AddField(
+            model_name='client',
+            name='website_url',
+            field=models.CharField(blank=True, default='', max_length=255, verbose_name='Website URL'),
+        ),
+        migrations.AlterField(
+            model_name='client',
+            name='jwt_alg',
+            field=models.CharField(choices=[('HS256', 'HS256'), ('RS256', 'RS256')], default='RS256', help_text='Algorithm used to encode ID Tokens.', max_length=10, verbose_name='JWT Algorithm'),
+        ),
+        migrations.AlterField(
+            model_name='client',
+            name='response_type',
+            field=models.CharField(choices=[('code', 'code (Authorization Code Flow)'), ('id_token', 'id_token (Implicit Flow)'), ('id_token token', 'id_token token (Implicit Flow)'), ('code token', 'code token (Hybrid Flow)'), ('code id_token', 'code id_token (Hybrid Flow)'), ('code id_token token', 'code id_token token (Hybrid Flow)')], max_length=30, verbose_name='Response Type'),
+        ),
+    ]
diff --git a/oidc_provider/migrations/0019_auto_20160908_1519.py b/oidc_provider/migrations/0019_auto_20160908_1519.py
deleted file mode 100644
index 320b30b..0000000
--- a/oidc_provider/migrations/0019_auto_20160908_1519.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('oidc_provider', '0018_auto_20160908_1627'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='client',
-            name='response_type',
-            field=models.CharField(choices=[('code', 'code (Authorization Code Flow)'), ('id_token', 'id_token (Implicit Flow)'), ('id_token token', 'id_token token (Implicit Flow)'), ('code token', 'code token (Hybrid Flow)'), ('code id_token', 'code id_token (Hybrid Flow)'), ('code id_token token', 'code id_token token (Hybrid Flow)')], verbose_name='Response Type', max_length=30),
-            preserve_default=True,
-        ),
-    ]
diff --git a/oidc_provider/migrations/0020_auto_20160909_1836.py b/oidc_provider/migrations/0020_auto_20160909_1836.py
deleted file mode 100644
index d2eb663..0000000
--- a/oidc_provider/migrations/0020_auto_20160909_1836.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2016-09-09 18:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('oidc_provider', '0019_auto_20160908_1519'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='client',
-            name='contact_email',
-            field=models.CharField(blank=True, default=b'', max_length=255, verbose_name='Contact Email'),
-        ),
-        migrations.AddField(
-            model_name='client',
-            name='logo',
-            field=models.FileField(blank=True, default=b'', upload_to=b'oidc_provider/clients', verbose_name='Logo Image'),
-        ),
-        migrations.AddField(
-            model_name='client',
-            name='terms_url',
-            field=models.CharField(blank=True, default=b'', help_text='External reference to the privacy policy of the client.', max_length=255, verbose_name='Terms URL'),
-        ),
-        migrations.AddField(
-            model_name='client',
-            name='website_url',
-            field=models.CharField(blank=True, default=b'', max_length=255, verbose_name='Website URL'),
-        ),
-    ]
diff --git a/oidc_provider/migrations/0021_auto_20160909_1855.py b/oidc_provider/migrations/0021_auto_20160909_1855.py
deleted file mode 100644
index 2115edd..0000000
--- a/oidc_provider/migrations/0021_auto_20160909_1855.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2016-09-09 18:55
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('oidc_provider', '0020_auto_20160909_1836'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='client',
-            name='jwt_alg',
-            field=models.CharField(choices=[(b'HS256', b'HS256'), (b'RS256', b'RS256')], default=b'RS256', help_text='Algorithm used to encode ID Tokens.', max_length=10, verbose_name='JWT Algorithm'),
-        ),
-    ]