diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f84bc..c7b83e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog for Rest-Framework-Auth-Toolkit
 
+## v0.11 (unreleased)
+
 
 ## v0.10
 
diff --git a/demo/requirements.txt b/demo/requirements.txt
index e1bfd51..c4c2fba 100644
--- a/demo/requirements.txt
+++ b/demo/requirements.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements.in
 #
-certifi==2018.11.29       # via requests
+certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
 click==7.0                # via pip-tools
 coreapi==2.3.3
@@ -13,19 +13,19 @@ dj-database-url==0.5.0
 django-debug-toolbar==1.11
 django-model-utils==3.1.2
 django-shortuuidfield==0.1.3
-django==2.1.7
-djangorestframework==3.9.1
-facepy==1.0.9
+django==2.1.11
+djangorestframework==3.9.4
+facepy==1.0.10
 idna==2.8                 # via requests
 itypes==1.1.0             # via coreapi
-jinja2==2.10              # via coreschema
+jinja2==2.10.1            # via coreschema
 markupsafe==1.1.1         # via jinja2
-pip-tools==3.4.0
-psycopg2==2.7.7
-pytz==2018.9              # via django
-requests==2.21.0          # via coreapi
+pip-tools==3.6.1
+psycopg2==2.8.2
+pytz==2019.1              # via django
+requests==2.21.0          # via coreapi, facepy
 shortuuid==0.5.0          # via django-shortuuidfield
-six==1.12.0               # via django-shortuuidfield, pip-tools
-sqlparse==0.2.4           # via django-debug-toolbar
+six==1.12.0               # via django-shortuuidfield, facepy, pip-tools
+sqlparse==0.3.0           # via django-debug-toolbar
 uritemplate==3.0.0        # via coreapi
-urllib3==1.24.1           # via requests
+urllib3==1.24.2           # via requests
diff --git a/rest_auth_toolkit/__init__.py b/rest_auth_toolkit/__init__.py
index 3a1ac8b..a99b3d9 100644
--- a/rest_auth_toolkit/__init__.py
+++ b/rest_auth_toolkit/__init__.py
@@ -1,5 +1,5 @@
 """Simple + flexible signup and login for Django APIs"""
 
-__version__ = '0.10'
+__version__ = '0.11.dev'
 
 default_app_config = 'rest_auth_toolkit.app.RestAuthToolkitConfig'
diff --git a/rest_auth_toolkit/views.py b/rest_auth_toolkit/views.py
index e6d43a3..8e3d6ec 100644
--- a/rest_auth_toolkit/views.py
+++ b/rest_auth_toolkit/views.py
@@ -51,12 +51,15 @@ def post(self, request):
         user = deserializer.save()
 
         if self.email_confirmation_class is None:
-            raise MissingSetting('email_confirmation_string')
+            raise MissingSetting('email_confirmation_class')
 
         confirmation = self.email_confirmation_class.objects.create(user=user)
         if get_setting('email_confirmation_send_email', True):
             email_field = user.get_email_field_name()
             send_email(request, user, getattr(user, email_field), confirmation)
+        else:
+            user.is_active = True
+            user.save()
 
         return Response(status=status.HTTP_201_CREATED)