diff --git a/.gitignore b/.gitignore
index 9b0f1d7..8f0d06c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ Thumbs.db
 # Environment #
 ###############
 *.env
+venv/
\ No newline at end of file
diff --git a/app.py b/app.py
index 70866f3..a0ecfcf 100644
--- a/app.py
+++ b/app.py
@@ -109,6 +109,11 @@ def bad_request(e):
     return content, 400
 
 
+def jwt_error(e):
+    print(f"JWT verification failed: {e}")
+    return "Payload verification failed!", 401
+
+
 # Helper for template rendering
 def render(template, context):
     return flask.render_template(template, **context)
@@ -188,14 +193,15 @@ def auth_callback():
 @app.route('/bigcommerce/load')
 def load():
     # Decode and verify payload
-    payload = flask.request.args['signed_payload']
-    user_data = BigcommerceApi.oauth_verify_payload(payload, client_secret())
-    if user_data is False:
-        return "Payload verification failed!", 401
+    payload = flask.request.args['signed_payload_jwt']
+    try:
+        user_data = BigcommerceApi.oauth_verify_payload_jwt(payload, client_secret(), client_id())
+    except Exception as e:
+        return jwt_error(e)
 
     bc_user_id = user_data['user']['id']
     email = user_data['user']['email']
-    store_hash = user_data['store_hash']
+    store_hash = user_data['sub'].split('stores/')[1]
 
     # Lookup store
     store = Store.query.filter_by(store_hash=store_hash).first()
@@ -224,13 +230,14 @@ def load():
 @app.route('/bigcommerce/uninstall')
 def uninstall():
     # Decode and verify payload
-    payload = flask.request.args['signed_payload']
-    user_data = BigcommerceApi.oauth_verify_payload(payload, client_secret())
-    if user_data is False:
-        return "Payload verification failed!", 401
+    payload = flask.request.args['signed_payload_jwt']
+    try:
+        user_data = BigcommerceApi.oauth_verify_payload_jwt(payload, client_secret(), client_id())
+    except Exception as e:
+        return jwt_error(e)
 
     # Lookup store
-    store_hash = user_data['store_hash']
+    store_hash = user_data['sub'].split('stores/')[1]
     store = Store.query.filter_by(store_hash=store_hash).first()
     if store is None:
         return "Store not found!", 401
@@ -250,14 +257,13 @@ def uninstall():
 # The Remove User Callback URL.
 @app.route('/bigcommerce/remove-user')
 def remove_user():
-    # Decode and verify payload
-    payload = flask.request.args['signed_payload']
-    user_data = BigcommerceApi.oauth_verify_payload(payload, client_secret())
-    if user_data is False:
-        return "Payload verification failed!", 401
+    payload = flask.request.args['signed_payload_jwt']
+    try:
+        user_data = BigcommerceApi.oauth_verify_payload_jwt(payload, client_secret(), client_id())
+    except Exception as e:
+        return jwt_error(e)
 
-    # Lookup store
-    store_hash = user_data['store_hash']
+    store_hash = user_data['sub'].split('stores/')[1]
     store = Store.query.filter_by(store_hash=store_hash).first()
     if store is None:
         return "Store not found!", 401
diff --git a/requirements.txt b/requirements.txt
index c8372c7..fc23c3a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ Werkzeug==2.0.1
 itsdangerous==2.0.1
 requests==2.25.1
 python-dotenv==0.17.1
-bigcommerce==0.22.0
+bigcommerce==0.22.2
 gunicorn==20.1.0
 psycopg2==2.8.6
 Flask-SQLAlchemy==2.5.1