diff --git a/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po b/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po
index 9801c67bcf90b182068410913f043520a5c838f2..a4df74bdfbc0cc868ff7494fa168c438958c7391 100644
--- a/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po
+++ b/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 17:27+0000\n"
+"POT-Creation-Date: 2023-03-01 09:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -239,6 +239,12 @@ msgstr ""
 msgid "Preferences successfully saved at %s"
 msgstr ""
 
+msgid "Activation link is invalid!"
+msgstr ""
+
+msgid "Account already active."
+msgstr "Your account is already active, you can log in."
+
 msgid ""
 "Thank you for your email confirmation, you account have been activated and "
 "you are now logged in."
@@ -246,6 +252,3 @@ msgstr ""
 
 msgid "Account activated"
 msgstr ""
-
-msgid "Activation link is invalid!"
-msgstr ""
diff --git a/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po b/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po
index 423648ff69f298e90454d0acf87983bc32e60dcb..60501f787dc792841cad394a7eacb7ccc13ded82 100644
--- a/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po
+++ b/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 17:27+0000\n"
+"POT-Creation-Date: 2023-03-01 09:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -279,6 +279,12 @@ msgstr "Supprimer le compte et toutes les données associées"
 msgid "Preferences successfully saved at %s"
 msgstr "Préférences enregistrées avec succès à %s"
 
+msgid "Activation link is invalid!"
+msgstr "Le lien d'activation est invalide !"
+
+msgid "Account already active."
+msgstr "Votre compte est déjà actif, vous pouvez vous connecter."
+
 msgid ""
 "Thank you for your email confirmation, you account have been activated and "
 "you are now logged in."
@@ -288,6 +294,3 @@ msgstr ""
 
 msgid "Account activated"
 msgstr "Compte activé"
-
-msgid "Activation link is invalid!"
-msgstr "Le lien d'activation est invalide !"
diff --git a/basetheme_bootstrap/views.py b/basetheme_bootstrap/views.py
index da5d342f80efa5cb8f59a615bd33ad35805004d2..ef56a2006c76c83e9a46269b88271e731ed4ed12 100644
--- a/basetheme_bootstrap/views.py
+++ b/basetheme_bootstrap/views.py
@@ -256,29 +256,30 @@ def activate(request, uidb64, token):
         uid = force_str(urlsafe_base64_decode(uidb64))
         user = get_user_model().objects.get(pk=uid)
     except(TypeError, ValueError, OverflowError, get_user_model().DoesNotExist):
-        user = None
-    if user is not None and user.groups.filter(name=__PENDING_ACCOUNT_USER).exists():
-        if tokens.account_activation_token.check_token(user, token):
-            user.is_active = True
-            user.groups.remove(user.groups.get(name=__PENDING_ACCOUNT_USER))
-            user.save()
-            login(request, user)
-            message = gettext('Thank you for your email confirmation, you account have been activated '
-                               'and you are now logged in.')
-            next_page = request.GET.get("next", '')
-            if next_page:
-                messages.success(request, message)
-                return redirect(next_page)
-            # return redirect('home')
-            # return HttpResponse('Thank you for your email confirmation. Now you can login your account.')
-            return render(request, 'basetheme_bootstrap/simple_message_page.html', {
-                'page_title': gettext('Account activated'),
-                'message': message,
-            })
-        else:
-            send_account_created(request, user)
-            return account_is_pending_view(request, email=user.email)
-    else:
         return render(request, 'basetheme_bootstrap/simple_message_page.html', {
             'page_title': gettext('Activation link is invalid!'),
         })
+    if not user.groups.filter(name=__PENDING_ACCOUNT_USER).exists():
+        return render(request, 'basetheme_bootstrap/simple_message_page.html', {
+            'page_title': gettext('Account already active.'),
+        })
+    if tokens.account_activation_token.check_token(user, token):
+        user.is_active = True
+        user.groups.remove(user.groups.get(name=__PENDING_ACCOUNT_USER))
+        user.save()
+        login(request, user)
+        message = gettext('Thank you for your email confirmation, you account have been activated '
+                           'and you are now logged in.')
+        next_page = request.GET.get("next", '')
+        if next_page:
+            messages.success(request, message)
+            return redirect(next_page)
+        # return redirect('home')
+        # return HttpResponse('Thank you for your email confirmation. Now you can login your account.')
+        return render(request, 'basetheme_bootstrap/simple_message_page.html', {
+            'page_title': gettext('Account activated'),
+            'message': message,
+        })
+    else:
+        send_account_created(request, user)
+        return account_is_pending_view(request, email=user.email)
diff --git a/setup.py b/setup.py
index c914417904207ad9a5d53624e91914ceab4657f5..1c701c6347f44361669a1b8a6d82ac34faea2940 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
 
 setup(
     name='django-basetheme-bootstrap',
-    version='1.0',
+    version='1.0.1',
     description='Django Basetheme Bootstrap',
     long_description=readme,
     author='Bryan Brancotte',