diff --git a/src/splatnet3_scraper/auth/nso.py b/src/splatnet3_scraper/auth/nso.py
index 0afbfe6..066746f 100644
--- a/src/splatnet3_scraper/auth/nso.py
+++ b/src/splatnet3_scraper/auth/nso.py
@@ -334,7 +334,7 @@ def parse_npf_uri(self, uri: str) -> str:
             str: The session token code. This is *NOT* the session token, but is
                 used to obtain the session token.
         """
-        return uri.split("&")[1][len("session_token_code=") :]
+        return uri.split("&")[0][uri.find("=")+1:]
 
     def get_session_token(self, session_token_code: str) -> str:
         """Obtains the session token from the session token code.
@@ -365,7 +365,7 @@ def get_session_token(self, session_token_code: str) -> str:
         params = {
             "client_id": "71b963c1b7b6d119",
             "session_token_code": session_token_code,
-            "session_token_code_verifier": self.verifier,
+            "session_token_code_verifier": self.verifier.replace(b'=', b''),
         }
         uri = "https://accounts.nintendo.com/connect/1.0.0/api/session_token"
         response = self.session.post(uri, headers=header, data=params)