diff --git a/flaskfdx/auth.py b/flaskfdx/auth.py
index 87221c1..2e3c7e9 100644
--- a/flaskfdx/auth.py
+++ b/flaskfdx/auth.py
@@ -12,7 +12,7 @@ bp = Blueprint('auth', __name__, url_prefix='/auth')
 @bp.route('/register', methods=('GET', 'POST'))
 def register():
     if request.method == 'POST':
-        userid = request.form['username']
+        userid = request.form['userid']
         email = request.form['email']
         password = request.form['password']
         db = get_db()
diff --git a/flaskfdx/templates/auth/login.html b/flaskfdx/templates/auth/login.html
new file mode 100644
index 0000000..8795ffa
--- /dev/null
+++ b/flaskfdx/templates/auth/login.html
@@ -0,0 +1,17 @@
+{% extends 'base.html' %}
+
+{% block header %}
+    <h1>{% block title %}Login{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+    <form method="post">
+        <label for="userid">Userid</label>
+        <input name="userid" id="userid" required>
+        <label for="email">Email</label>
+        <input type="email" name="email" id="email" required>
+        <label for="password">Password</label>
+        <input type="password" name="password" id="password" required>
+        <input type="submit" value="Login">
+    </form>
+{% endblock %}
diff --git a/flaskfdx/templates/auth/register.html b/flaskfdx/templates/auth/register.html
new file mode 100644
index 0000000..39c4ca5
--- /dev/null
+++ b/flaskfdx/templates/auth/register.html
@@ -0,0 +1,17 @@
+{% extends 'base.html' %}
+
+{% block header %}
+    <h1>{% block title %}Register{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+    <form method="post">
+        <label for="userid">Userid</label>
+        <input name="userid" id="userid" required>
+        <label for="email">Email</label>
+        <input type="email" name="email" id="email" required>
+        <label for="password">Password</label>
+        <input type="password" name="password" id="password" required>
+        <input type="submit" value="Register">
+    </form>
+{% endblock %}