diff --git a/webservice/api.py b/webservice/api.py
index 837f55b..554e8fb 100644
--- a/webservice/api.py
+++ b/webservice/api.py
@@ -25,7 +25,7 @@ def login():
     username = request_data['username']
     password = request_data['password']
 
-    user = User.filter_by(username=username).first()
+    user = db.session.query(User).filter_by(username=username).first()
     if check_password(user.password, password):
         # TODO Return token
         return jsonify({"status": 200, "text": "Successfully logged in"})
@@ -45,7 +45,8 @@ def register():
     username = request_data['username']
     password = request_data['password']
 
-    if User.filter_by(username=username).first() is None:
+    user = db.session.query(User).filter_by(username=username).first()
+    if user is None:
         # Username doesn't exist yet
         user = User(
             username=username,