diff --git a/apps/user/migrations/0007_auto_20180207_0808.py b/apps/user/migrations/0007_auto_20180207_0808.py
new file mode 100644
index 00000000..98dd1616
--- /dev/null
+++ b/apps/user/migrations/0007_auto_20180207_0808.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.0.2 on 2018-02-07 08:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0006_auto_20180206_1352'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='city',
+            field=models.CharField(blank=True, max_length=85, null=True, verbose_name='Город'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='country',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Страна'),
+        ),
+    ]
diff --git a/apps/user/models.py b/apps/user/models.py
index 5d88315e..925aa845 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -10,17 +10,20 @@ class User(AbstractUser):
         (1, 'автор'),
         (2, 'администратор'),
     )
+    NOT_DEFINED = 'n'
+    MALE = 'm'
+    FEMALE = 'f'
     GENDER_CHOICES = (
-        ('n', 'не указан'),
-        ('m', 'Мужчина'),
-        ('f', 'Женщина'),
+        (NOT_DEFINED, 'не указан'),
+        (MALE, 'Мужчина'),
+        (FEMALE, 'Женщина'),
     )
     email = models.EmailField(_('email address'), unique=True)
     role = models.PositiveSmallIntegerField('Роль', default=0, choices=ROLE_CHOICES)
     gender = models.CharField('Пол', max_length=1, default='n', choices=GENDER_CHOICES)
     birthday = models.DateField('День рождения', null=True, blank=True)
-    country = models.CharField('Страна', max_length=50, default='')
-    city = models.CharField('Город', max_length=85, default='')
+    country = models.CharField('Страна', max_length=50, null=True, blank=True)
+    city = models.CharField('Город', max_length=85, null=True, blank=True)
     about = models.CharField('О себе', max_length=1000, null=True, blank=True)
     instagram = models.URLField(default='', null=True, blank=True)
     facebook = models.URLField(default='', null=True, blank=True)