diff --git a/oser_backend/settings/common.py b/oser_backend/settings/common.py
index cdbf6bde5e0fad6c84fec61ecebb46b993850bf4..de6a2158d1f25dc67f5592173982e9ca1e0ce31c 100644
--- a/oser_backend/settings/common.py
+++ b/oser_backend/settings/common.py
@@ -254,6 +254,7 @@ EMAIL_HOST_USER = 'apikey'
 EMAIL_HOST_PASSWORD = SENDGRID_API_KEY
 EMAIL_PORT = 587
 EMAIL_USE_TLS = True
+LOGIN_URL = os.getenv('LOGIN_URL')
 
 # Toggle sandbox mode (when running in DEBUG mode)
 SENDGRID_SANDBOX_MODE_IN_DEBUG = False
@@ -298,3 +299,5 @@ TELEGRAM = {
     'channel_name': 'oserSECGEN',
     'production': False,
 }
+
+VERIFICATION_SUCCESS_TEMPLATE = None
diff --git a/register/signals.py b/register/signals.py
index 6a1bd76ae455c2a22f09e7b42fff2a8803973cdb..f249fda06f5959993edc1e2188728737eb88199c 100644
--- a/register/signals.py
+++ b/register/signals.py
@@ -19,15 +19,10 @@ registration_created = Signal(
 def create_user_and_student(sender, instance: Registration, request, validated_data,
                             password: str, **kwargs):
     """Create a user and student after on a registration_created signal."""
-    # user = User.objects.create_user(
-    #     email=instance.email,
-    #     password=password,
-    #     first_name=instance.first_name,
-    #     last_name=instance.last_name,
-    #     phone_number=instance.phone_number,
-    #     is_active=False,
-    # )
-    validated_data['password'] = password
+
+    validated_data['password1'] = password
+    validated_data['password2'] = password
+
     form = UserForm(validated_data)
     if form.is_valid():
         user = send_verification_email(
diff --git a/users/forms.py b/users/forms.py
index f2718cca1e0342901338eee312abc2dcd11283fd..048594dd41dfb9b41c081774aa58219a634ec296 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -1,10 +1,10 @@
 from django.forms import ModelForm, TextInput, EmailInput
 from .models import User
-from users.models import User
+from django.contrib.auth.forms import UserCreationForm
 
 
-class UserForm(ModelForm):
-    class Meta:
+class UserForm(UserCreationForm):
+    class Meta(UserCreationForm.Meta):
         model = User
-        fields = ["email", "password", "first_name",
+        fields = ["email", "first_name",
                   "last_name", "phone_number"]