diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 7a22327fc..8be4f2919 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -1,14 +1,16 @@
 {%- if cookiecutter.username_type == "email" %}
 from django.contrib.auth.hashers import make_password
-from django.contrib.auth.models import AbstractUser, UserManager as DjangoUserManager
-{%- else %}
+{%- endif -%}
 from django.contrib.auth.models import AbstractUser
+{%- if cookiecutter.username_type == "email" %}
+from django.contrib.auth.models import UserManager as DjangoUserManager
 {%- endif %}
 from django.db.models import CharField{% if cookiecutter.username_type == "email" %}, EmailField{% endif %}
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-
 {%- if cookiecutter.username_type == "email" %}
+
+
 class UserManager(DjangoUserManager):
     def _create_user(self, email, password, **extra_fields):
         """
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index 2903bb78f..062d7dc88 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -5,10 +5,7 @@ from {{ cookiecutter.project_slug }}.users.models import User
 
 def test_detail(user: User):
     {%- if cookiecutter.username_type == "email" %}
-    assert (
-        reverse("users:detail", kwargs={"pk": user.pk})
-        == f"/users/{user.pk}/"
-    )
+    assert reverse("users:detail", kwargs={"pk": user.pk}) == f"/users/{user.pk}/"
     assert resolve(f"/users/{user.pk}/").view_name == "users:detail"
     {%- else %}
     assert (