diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 74b32f0..4bccccc 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -120,13 +120,13 @@ async function clearRegistryLoginDetails() {
 
 async function setRegistryLoginDetails(tokenOrAccount, loginUid) {
   const accList = await getRegistryLoginDetails()
-  const cur = accList.find(a => a.is_login)
+  const cur = accList.find(a => a.is_login) || accList[0]
 
   // Required fields: uid, token, account, deviceId
 
   const { token, deviceId } = cur
 
-  createCmdWindow(`.\\tools\\mtools.exe set -a ${tokenOrAccount} -u ${loginUid} -t ${token} -d ${deviceId}`)
+  createCmdWindow(`.\\tools\\mtools.exe set -a "${tokenOrAccount}" -u "${loginUid}" -t "${token}" -d "${deviceId}"`)
 }
 
 /**
diff --git a/resources/js/login.js b/resources/js/login.js
index 5fd7f8e..b62676c 100644
--- a/resources/js/login.js
+++ b/resources/js/login.js
@@ -93,7 +93,10 @@ async function login() {
       await Neutralino.clipboard.writeText(tkData.token)
 
       displayLoginAlert(localeObj.alertLoginSuccess || 'Login successful! Token copied to clipboard. Paste this token into the username field of the game to log in.', 'success', 8000);
-      launchPrivate()
+      
+      await setRegistryLoginDetails(tkData.token, tkData.uid)
+      await launchPrivate()
+      
       break;
   }
 }