diff --git a/app/migrations/0002_auto_20161115_2054.py b/app/migrations/0002_auto_20161115_2054.py
new file mode 100644
index 0000000..0a8a21f
--- /dev/null
+++ b/app/migrations/0002_auto_20161115_2054.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 23:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emailbackend',
+            name='default_from_email',
+            field=models.EmailField(max_length=254, verbose_name='Default from email'),
+        ),
+    ]
diff --git a/core/forms.py b/core/forms.py
index 454bee7..43b280a 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -10,7 +10,7 @@ import re
 class RegisterUserForm(forms.ModelForm):
 
     password = forms.CharField(label=_('Password'), widget=forms.PasswordInput)
-    password2 = forms.CharField(label = _('Password confirmation'), widget = forms.PasswordInput)
+    password2 = forms.CharField(label = _('Confirm Password'), widget = forms.PasswordInput)
     # birth_date = forms.DateField(widget=forms.SelectDateWidget())
     MIN_LENGTH = 8
 
@@ -36,6 +36,8 @@ class RegisterUserForm(forms.ModelForm):
 
     def clean_cpf(self):
         cpf = self.cleaned_data['cpf']
+        if (cpf == ""):
+            return cpf
         if User.objects.filter(cpf = cpf).exists():
             raise forms.ValidationError(_('There is already a registered User with this CPF'))
        # if not self.validate_cpf(cpf):
diff --git a/users/migrations/0003_auto_20161115_2054.py b/users/migrations/0003_auto_20161115_2054.py
new file mode 100644
index 0000000..a1f229c
--- /dev/null
+++ b/users/migrations/0003_auto_20161115_2054.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 23:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_auto_20161115_1941'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='cpf',
+            field=models.CharField(blank=True, max_length=15, null=True, verbose_name='CPF'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Photo'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='institution',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution'),
+        ),
+    ]
--
libgit2 0.21.2