diff --git a/flaskfdx/auth.py b/flaskfdx/auth.py
index 2e3c7e9..f6cafb7 100644
--- a/flaskfdx/auth.py
+++ b/flaskfdx/auth.py
@@ -59,7 +59,7 @@ def login():
 
         if error is None:
             session.clear()
-            session['user_id'] = user['id']
+            session['user_id'] = user['userid']
             return redirect(url_for('index'))
 
         flash(error)
@@ -74,7 +74,7 @@ def load_logged_in_user():
         g.user = None
     else:
         g.user = get_db().execute(
-            'SELECT * FROM users WHERE id = ?', (user_id,)
+            'SELECT * FROM users WHERE userid = ?', (user_id,)
         ).fetchone()
 
 @bp.route('.logout')