diff --git a/login_provider/app.py b/login_provider/app.py
index 3e472cdd8630c7076ff59c6498c725b7ad11f22d..9bc9b57398d09ec0f1d08f25a937363975be7f9f 100644
--- a/login_provider/app.py
+++ b/login_provider/app.py
@@ -1,10 +1,9 @@
 from flask import abort, Flask, redirect, request, render_template, url_for
 from os import urandom, environ
 from hydra_client import HydraAdmin
-from wtforms import SubmitField, StringField, PasswordField, HiddenField, validators
-from flask_wtf import FlaskForm
 from flask_login import login_user, logout_user, LoginManager, login_required, current_user
 from db import User
+from forms import LoginForm, LogoutForm
 
 HYDRA_ADMIN_URL = environ['HYDRA_ADMIN_URL']
 
@@ -23,16 +22,6 @@ def user_loader(username):
         return
     return user
 
-class LogoutForm(FlaskForm):
-    logout = SubmitField("logout")
-
-class LoginForm(FlaskForm):
-    username = StringField("username", validators=[validators.input_required()])
-    password = PasswordField("password", validators=[validators.input_required()])
-    next_url = HiddenField("next_url")
-    submit = SubmitField("Sign in")
-
-
 @app.route('/')
 @login_required
 def home():
@@ -69,7 +58,6 @@ def is_safe_url(url):
                    and url[18:].isalnum() or safe else False
     return safe
 
-
 @app.route('/logout', methods=['POST'])
 def logout():
     if request.method == "POST":
diff --git a/login_provider/forms.py b/login_provider/forms.py
new file mode 100644
index 0000000000000000000000000000000000000000..ea948d5e2a9041880b3daf80a7fe94e9ff0ba378
--- /dev/null
+++ b/login_provider/forms.py
@@ -0,0 +1,13 @@
+from wtforms import SubmitField, StringField, PasswordField, HiddenField, validators
+from flask_wtf import FlaskForm
+
+
+class LogoutForm(FlaskForm):
+    logout = SubmitField("logout")
+
+
+class LoginForm(FlaskForm):
+    username = StringField("username", validators=[validators.input_required()])
+    password = PasswordField("password", validators=[validators.input_required()])
+    next_url = HiddenField("next_url")
+    submit = SubmitField("Sign in")