diff --git a/passbook/core/models.py b/passbook/core/models.py
index a27668b45e..d11e2c9065 100644
--- a/passbook/core/models.py
+++ b/passbook/core/models.py
@@ -21,9 +21,9 @@ from jinja2.nativetypes import NativeEnvironment
 from model_utils.managers import InheritanceManager
 from structlog import get_logger
 
-from passbook.core.types import UIUserSettings, UILoginButton
 from passbook.core.exceptions import PropertyMappingExpressionException
 from passbook.core.signals import password_changed
+from passbook.core.types import UILoginButton, UIUserSettings
 from passbook.lib.models import CreatedUpdatedModel, UUIDModel
 from passbook.policies.exceptions import PolicyException
 from passbook.policies.types import PolicyRequest, PolicyResult
diff --git a/passbook/core/templatetags/passbook_user_settings.py b/passbook/core/templatetags/passbook_user_settings.py
index 39773799e3..478903b1cd 100644
--- a/passbook/core/templatetags/passbook_user_settings.py
+++ b/passbook/core/templatetags/passbook_user_settings.py
@@ -1,11 +1,11 @@
 """passbook user settings template tags"""
-from typing import List, Iterable
+from typing import Iterable, List
 
 from django import template
 from django.template.context import RequestContext
 
-from passbook.core.types import UIUserSettings
 from passbook.core.models import Factor, Source
+from passbook.core.types import UIUserSettings
 from passbook.policies.engine import PolicyEngine
 
 register = template.Library()
diff --git a/passbook/core/types.py b/passbook/core/types.py
index 17937b527b..0e03a91aff 100644
--- a/passbook/core/types.py
+++ b/passbook/core/types.py
@@ -1,6 +1,6 @@
 """passbook core dataclasses"""
-from typing import Optional
 from dataclasses import dataclass
+from typing import Optional
 
 
 @dataclass
diff --git a/passbook/factors/otp/models.py b/passbook/factors/otp/models.py
index 8e751e625f..1c87d6d69d 100644
--- a/passbook/factors/otp/models.py
+++ b/passbook/factors/otp/models.py
@@ -2,8 +2,8 @@
 from django.db import models
 from django.utils.translation import gettext as _
 
-from passbook.core.types import UIUserSettings
 from passbook.core.models import Factor
+from passbook.core.types import UIUserSettings
 
 
 class OTPFactor(Factor):
diff --git a/passbook/factors/password/models.py b/passbook/factors/password/models.py
index e9af9722a3..a979806411 100644
--- a/passbook/factors/password/models.py
+++ b/passbook/factors/password/models.py
@@ -3,8 +3,8 @@ from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from passbook.core.types import UIUserSettings
 from passbook.core.models import Factor, Policy, User
+from passbook.core.types import UIUserSettings
 
 
 class PasswordFactor(Factor):
diff --git a/passbook/sources/ldap/connector.py b/passbook/sources/ldap/connector.py
index bad3709f02..064a6a628a 100644
--- a/passbook/sources/ldap/connector.py
+++ b/passbook/sources/ldap/connector.py
@@ -3,8 +3,8 @@ from typing import Any, Dict, Optional
 
 import ldap3
 import ldap3.core.exceptions
-from structlog import get_logger
 from django.db.utils import IntegrityError
+from structlog import get_logger
 
 from passbook.core.exceptions import PropertyMappingExpressionException
 from passbook.core.models import Group, User
diff --git a/passbook/sources/oauth/models.py b/passbook/sources/oauth/models.py
index 0dde24162d..17d4e8c2f9 100644
--- a/passbook/sources/oauth/models.py
+++ b/passbook/sources/oauth/models.py
@@ -4,8 +4,8 @@ from django.db import models
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
 
-from passbook.core.types import UILoginButton, UIUserSettings
 from passbook.core.models import Source, UserSourceConnection
+from passbook.core.types import UILoginButton, UIUserSettings
 from passbook.sources.oauth.clients import get_client
 
 
diff --git a/scripts/pre-commit.sh b/scripts/pre-commit.sh
index 7e5a6e3b94..f4c2bf4f88 100755
--- a/scripts/pre-commit.sh
+++ b/scripts/pre-commit.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -xe
+isort -rc passbook
 black passbook
 scripts/coverage.sh
 pylint passbook