diff --git a/app/users/forms.py b/app/users/forms.py
index cd90f21a..3f874167 100644
--- a/app/users/forms.py
+++ b/app/users/forms.py
@@ -1,7 +1,5 @@
 from django import forms
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Field
 
 from .models import CustomUser
 
diff --git a/app/users/models.py b/app/users/models.py
index dcfbbf64..659ac76b 100644
--- a/app/users/models.py
+++ b/app/users/models.py
@@ -1,5 +1,4 @@
 from django.contrib.auth.models import AbstractUser
-from django.db import models
 
 
 class CustomUser(AbstractUser):
diff --git a/app/users/tokens.py b/app/users/tokens.py
deleted file mode 100644
index 8fc124a2..00000000
--- a/app/users/tokens.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from django.contrib.auth.tokens import PasswordResetTokenGenerator
-
-
-class AccountActivationTokenGenerator(PasswordResetTokenGenerator):
-    def _make_hash_value(self, user, timestamp):
-        return user.pk + timestamp + user.is_active
-
-
-account_activation_token = AccountActivationTokenGenerator()
diff --git a/app/users/views.py b/app/users/views.py
index 41d873da..e88ff55d 100644
--- a/app/users/views.py
+++ b/app/users/views.py
@@ -9,14 +9,11 @@
 from django.core.mail import EmailMessage, send_mail, BadHeaderError
 from django.db.models import Q
 from django.http import HttpResponse
-from django.http.response import HttpResponseRedirect
 from django.shortcuts import render, redirect
 from django.template.loader import render_to_string
-from django.urls.base import reverse
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
 from django.views.decorators.http import require_http_methods
-
 from .forms import CustomUserCreationForm, CustomUserChangeForm
 from .models import CustomUser
 
@@ -28,11 +25,9 @@
 def signup(request):
     if request.method == "POST":
         form = CustomUserCreationForm(request.POST)
-        # print(form.errors.as_data())
         if form.is_valid():
             user = form.save(commit=False)
-            # user.is_active = False
-            user.is_active = True
+            user.is_active = False
             user.save()
             current_site = get_current_site(request)
             mail_subject = "Activate your account."
@@ -47,9 +42,9 @@ def signup(request):
             )
             to_email = form.cleaned_data.get("email")
             email = EmailMessage(mail_subject, message, to=[to_email])
-            # email.send()
-            # return HttpResponse('Please confirm your email address to complete the registration')
-            return HttpResponseRedirect(reverse("login"))
+            email.send()
+            messages.info(request, "Please confirm your email address to complete the registration")
+            return redirect("home")
     else:
         form = CustomUserCreationForm()
     return render(request, "registration/signup.html", {"form": form})
@@ -64,11 +59,11 @@ def activate(request, uidb64, token):
     if user is not None and default_token_generator.check_token(user, token):
         user.is_active = True
         user.save()
-        return HttpResponse(
-            "Thank you for your email confirmation. Now you can login your account."
-        )
+        messages.success(request, "Thank you for your email confirmation. Now you can login your account.")
+        return redirect("login")
     else:
         return HttpResponse("Activation link is invalid!")
+        return redirect("home")
 
 
 @login_required