diff --git a/flaskfdx/auth.py b/flaskfdx/auth.py
index 74c22e4..e01865a 100644
--- a/flaskfdx/auth.py
+++ b/flaskfdx/auth.py
@@ -9,7 +9,18 @@ from flaskfdx.db import get_db
 
 bp = Blueprint('auth', __name__, url_prefix='/auth')
 
+def login_required(view):
+    @functools.wraps(view)
+    def wrapped_view(**kwargs):
+        if g.user is None:
+            return redirect(url_for('auth.login'))
+
+        return view(**kwargs)
+
+    return wrapped_view
+
 @bp.route('/register', methods=('GET', 'POST'))
+@login_required
 def register():
     if request.method == 'POST':
         userid = request.form['userid']
@@ -35,7 +46,7 @@ def register():
             except db.IntegrityError:
                 error = f"User {userid} is already registered."
             else:
-                return redirect(url_for("auth.login"))
+                return redirect(url_for("index"))
 
         flash(error)
 
@@ -82,12 +93,4 @@ def logout():
     session.clear()
     return redirect(url_for('index'))
 
-def login_required(view):
-    @functools.wraps(view)
-    def wrapped_view(**kwargs):
-        if g.user is None:
-            return redirect(url_for('auth.login'))
 
-        return view(**kwargs)
-
-    return wrapped_view
diff --git a/flaskfdx/templates/base.html b/flaskfdx/templates/base.html
index e2e9e59..800bdd9 100644
--- a/flaskfdx/templates/base.html
+++ b/flaskfdx/templates/base.html
@@ -14,9 +14,9 @@
         <ul>
             {% if g.user %}
             <li><span>{{ g.user['userid'] }}</span>
+            <li><a href="{{ url_for('auth.register') }}">Add User</a>
             <li><a href="{{ url_for('auth.logout') }}">Log Out</a>
             {% else %}
-            <li><a href="{{ url_for('auth.register') }}">Register</a>
             <li><a href="{{ url_for('auth.login') }}">Log In</a>
             {% endif %}
         </ul>