diff --git a/invenio_oauthclient/admin.py b/invenio_oauthclient/admin.py
index 1e61458..eeb352b 100644
--- a/invenio_oauthclient/admin.py
+++ b/invenio_oauthclient/admin.py
@@ -11,6 +11,7 @@
 from flask_admin.contrib.sqla import ModelView
 from invenio_accounts.admin import user_identity_adminview
 from invenio_i18n import lazy_gettext as _
+
 from .models import RemoteAccount, RemoteToken
 
 
diff --git a/invenio_oauthclient/contrib/cern.py b/invenio_oauthclient/contrib/cern.py
index 4485a48..61bcf0b 100644
--- a/invenio_oauthclient/contrib/cern.py
+++ b/invenio_oauthclient/contrib/cern.py
@@ -148,7 +148,8 @@
     identity_loaded,
 )
 from invenio_db import db
-from invenio_i18n import gettext as _, lazy_gettext
+from invenio_i18n import gettext as _
+from invenio_i18n import lazy_gettext
 
 from invenio_oauthclient.errors import OAuthCERNRejectedAccountError
 from invenio_oauthclient.handlers.rest import response_handler
diff --git a/invenio_oauthclient/contrib/cern_openid.py b/invenio_oauthclient/contrib/cern_openid.py
index c3fa714..12cdefd 100644
--- a/invenio_oauthclient/contrib/cern_openid.py
+++ b/invenio_oauthclient/contrib/cern_openid.py
@@ -76,7 +76,8 @@
     identity_loaded,
 )
 from invenio_db import db
-from invenio_i18n import gettext as _, lazy_gettext
+from invenio_i18n import gettext as _
+from invenio_i18n import lazy_gettext
 from jwt import decode
 
 from invenio_oauthclient.errors import OAuthCERNRejectedAccountError
diff --git a/invenio_oauthclient/contrib/github.py b/invenio_oauthclient/contrib/github.py
index ac728ab..33bc5dd 100644
--- a/invenio_oauthclient/contrib/github.py
+++ b/invenio_oauthclient/contrib/github.py
@@ -73,8 +73,8 @@
 from flask import current_app, redirect, url_for
 from flask_login import current_user
 from invenio_db import db
-
 from invenio_i18n import lazy_gettext as _
+
 from invenio_oauthclient import current_oauthclient
 from invenio_oauthclient.contrib.settings import OAuthSettingsHelper
 from invenio_oauthclient.errors import OAuthResponseError
diff --git a/invenio_oauthclient/contrib/globus.py b/invenio_oauthclient/contrib/globus.py
index 7ecfc0a..939f39f 100644
--- a/invenio_oauthclient/contrib/globus.py
+++ b/invenio_oauthclient/contrib/globus.py
@@ -67,8 +67,8 @@
 from flask import current_app, redirect, url_for
 from flask_login import current_user
 from invenio_db import db
-
 from invenio_i18n import lazy_gettext as _
+
 from invenio_oauthclient import current_oauthclient
 from invenio_oauthclient.contrib.settings import OAuthSettingsHelper
 from invenio_oauthclient.errors import OAuthResponseError
diff --git a/invenio_oauthclient/contrib/openaire_aai.py b/invenio_oauthclient/contrib/openaire_aai.py
index af775ca..737cf61 100644
--- a/invenio_oauthclient/contrib/openaire_aai.py
+++ b/invenio_oauthclient/contrib/openaire_aai.py
@@ -72,8 +72,8 @@
 from flask import current_app, redirect, url_for
 from flask_login import current_user
 from invenio_db import db
-
 from invenio_i18n import lazy_gettext as _
+
 from invenio_oauthclient import current_oauthclient
 from invenio_oauthclient.contrib.keycloak import KeycloakSettingsHelper
 from invenio_oauthclient.contrib.settings import OAuthSettingsHelper
diff --git a/invenio_oauthclient/contrib/orcid.py b/invenio_oauthclient/contrib/orcid.py
index 3244768..39819ce 100644
--- a/invenio_oauthclient/contrib/orcid.py
+++ b/invenio_oauthclient/contrib/orcid.py
@@ -74,8 +74,8 @@
 from flask import current_app, redirect, url_for
 from flask_login import current_user
 from invenio_db import db
-
 from invenio_i18n import lazy_gettext as _
+
 from invenio_oauthclient import current_oauthclient
 from invenio_oauthclient.contrib.settings import OAuthSettingsHelper
 from invenio_oauthclient.handlers.rest import response_handler
diff --git a/invenio_oauthclient/handlers/ui.py b/invenio_oauthclient/handlers/ui.py
index f4fb399..5ab0a67 100644
--- a/invenio_oauthclient/handlers/ui.py
+++ b/invenio_oauthclient/handlers/ui.py
@@ -154,7 +154,7 @@ def authorized_signup_handler(resp, remote, *args, **kwargs):
             Markup(
                 _(
                     'A confirmation email has already been sent to %(email)s. Didn\'t receive it? Click <strong><a href="%(url)s">here</a></strong> to resend it.',
-                    mail=exc.user.email,
+                    email=exc.user.email,
                     url=url_for("security.send_confirmation"),
                 )
             ),