diff --git a/UT4MasterServer.Web/src/pages/ActivateAccount.vue b/UT4MasterServer.Web/src/pages/ActivateAccount.vue
index 3ddf5f10..44b9d73a 100644
--- a/UT4MasterServer.Web/src/pages/ActivateAccount.vue
+++ b/UT4MasterServer.Web/src/pages/ActivateAccount.vue
@@ -30,16 +30,16 @@ const accountService = new AccountService();
 async function activateAccount() {
   try {
     status.value = AsyncStatus.BUSY;
-    const { accountId, guid } = route.query;
+    const { accountId: qAccountId, guid: qGuid } = route.query;
 
-    if (accountId?.toString() === '' || guid?.toString() === '') {
+    if (!qAccountId?.length || !qGuid?.length) {
       status.value = AsyncStatus.ERROR;
       return;
     }
 
     const formData = {
-      accountId: accountId as string,
-      guid: guid as string
+      accountId: qAccountId as string,
+      guid: qGuid as string
     };
 
     await accountService.activateAccount(formData);
diff --git a/UT4MasterServer.Web/src/pages/Login.vue b/UT4MasterServer.Web/src/pages/Login.vue
index d6210891..f2c42137 100644
--- a/UT4MasterServer.Web/src/pages/Login.vue
+++ b/UT4MasterServer.Web/src/pages/Login.vue
@@ -123,7 +123,8 @@ const route = useRoute();
 
 function parseQueryValues() {
   const { activationLinkSent: qActivationLinkSent } = route.query;
-  if (qActivationLinkSent?.toString() === 'true') {
+
+  if (qActivationLinkSent === 'true') {
     activationLinkSent.value = true;
   }
 }