diff --git a/pagure/forms.py b/pagure/forms.py
index beb7964..b9ee0fa 100644
--- a/pagure/forms.py
+++ b/pagure/forms.py
@@ -17,8 +17,8 @@ import re
 import flask
 import flask_wtf as wtf
 try:
-    from flask_wtf import FlaskForm as FlaskForm
-except:
+    from flask_wtf import FlaskForm
+except ImportError:
     from flask_wtf import Form as FlaskForm
 
 import wtforms
diff --git a/pagure/hooks/fedmsg.py b/pagure/hooks/fedmsg.py
index 14938c3..0946f74 100644
--- a/pagure/hooks/fedmsg.py
+++ b/pagure/hooks/fedmsg.py
@@ -11,7 +11,7 @@
 import sqlalchemy as sa
 import wtforms
 try:
-    from flask_wtf import FlaskForm as FlaskForm
+    from flask_wtf import FlaskForm
 except:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
diff --git a/pagure/hooks/irc.py b/pagure/hooks/irc.py
index 5b6b421..2e61ce0 100644
--- a/pagure/hooks/irc.py
+++ b/pagure/hooks/irc.py
@@ -14,7 +14,7 @@ import sqlalchemy as sa
 import pygit2
 import wtforms
 try:
-    from flask_wtf import FlaskForm as FlaskForm
+    from flask_wtf import FlaskForm
 except:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
diff --git a/pagure/hooks/mail.py b/pagure/hooks/mail.py
index a031c71..c99d61f 100644
--- a/pagure/hooks/mail.py
+++ b/pagure/hooks/mail.py
@@ -12,8 +12,8 @@ import sqlalchemy as sa
 import pygit2
 import wtforms
 try:
-    from flask_wtf import FlaskForm as FlaskForm
-except:
+    from flask_wtf import FlaskForm
+except ImportError:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
 from sqlalchemy.orm import backref
diff --git a/pagure/hooks/pagure_ci.py b/pagure/hooks/pagure_ci.py
index de8fe13..5ff4612 100644
--- a/pagure/hooks/pagure_ci.py
+++ b/pagure/hooks/pagure_ci.py
@@ -11,8 +11,8 @@
 import sqlalchemy as sa
 import wtforms
 try:
-    from flask_wtf import FlaskForm as FlaskForm
-except:
+    from flask_wtf import FlaskForm
+except ImportError:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
 from sqlalchemy.orm import backref
diff --git a/pagure/hooks/pagure_force_commit.py b/pagure/hooks/pagure_force_commit.py
index 5e04b0d..1152458 100644
--- a/pagure/hooks/pagure_force_commit.py
+++ b/pagure/hooks/pagure_force_commit.py
@@ -12,8 +12,8 @@ import sqlalchemy as sa
 import pygit2
 import wtforms
 try:
-    from flask_wtf import FlaskForm as FlaskForm
-except:
+    from flask_wtf import FlaskForm
+except ImportError:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
 from sqlalchemy.orm import backref
diff --git a/pagure/hooks/pagure_hook.py b/pagure/hooks/pagure_hook.py
index 5dbc1d8..16880d5 100644
--- a/pagure/hooks/pagure_hook.py
+++ b/pagure/hooks/pagure_hook.py
@@ -13,8 +13,8 @@ import os
 import sqlalchemy as sa
 import wtforms
 try:
-    from flask_wtf import FlaskForm as FlaskForm
-except:
+    from flask_wtf import FlaskForm
+except ImportError:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
 from sqlalchemy.orm import backref
diff --git a/pagure/hooks/pagure_request_hook.py b/pagure/hooks/pagure_request_hook.py
index e494149..3aa049f 100644
--- a/pagure/hooks/pagure_request_hook.py
+++ b/pagure/hooks/pagure_request_hook.py
@@ -14,8 +14,8 @@ import flask
 import sqlalchemy as sa
 import wtforms
 try:
-    from flask_wtf import FlaskForm as FlaskForm
-except:
+    from flask_wtf import FlaskForm
+except ImportError:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
 from sqlalchemy.orm import backref
diff --git a/pagure/hooks/pagure_ticket_hook.py b/pagure/hooks/pagure_ticket_hook.py
index fe3274d..3a97688 100644
--- a/pagure/hooks/pagure_ticket_hook.py
+++ b/pagure/hooks/pagure_ticket_hook.py
@@ -14,7 +14,7 @@ import flask
 import sqlalchemy as sa
 import wtforms
 try:
-    from flask_wtf import FlaskForm as FlaskForm
+    from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
diff --git a/pagure/hooks/pagure_unsigned_commits.py b/pagure/hooks/pagure_unsigned_commits.py
index 99750e7..fbb6448 100644
--- a/pagure/hooks/pagure_unsigned_commits.py
+++ b/pagure/hooks/pagure_unsigned_commits.py
@@ -11,7 +11,7 @@
 import sqlalchemy as sa
 import wtforms
 try:
-    from flask_wtf import FlaskForm as FlaskForm
+    from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
diff --git a/pagure/hooks/rtd.py b/pagure/hooks/rtd.py
index dee80f9..a679b09 100644
--- a/pagure/hooks/rtd.py
+++ b/pagure/hooks/rtd.py
@@ -13,7 +13,7 @@ import sqlalchemy as sa
 import wtforms
 
 try:
-    from flask_wtf import FlaskForm as FlaskForm
+    from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
 from sqlalchemy.orm import relation
diff --git a/pagure/login_forms.py b/pagure/login_forms.py
index cf9dd74..f1c2e79 100644
--- a/pagure/login_forms.py
+++ b/pagure/login_forms.py
@@ -20,11 +20,11 @@
 # pylint: disable=no-init
 
 
+import wtforms
 try:
     from flask_wtf import FlaskForm as FlaskForm
-except:
+except ImportError:
     from flask_wtf import Form as FlaskForm
-import wtforms
 
 from pagure.forms import ConfirmationForm