diff --git a/src/utils/Utils.js b/src/utils/Utils.js
index 36ebdc8..84a1ead 100644
--- a/src/utils/Utils.js
+++ b/src/utils/Utils.js
@@ -17,12 +17,12 @@ export const TrackMe = async (id64, authcode, sharecode) => {
   const shareCodeRegex = /^CSGO(?:-?[ABCDEFGHJKLMNOPQRSTUVWXYZabcdefhijkmnopqrstuvwxyz23456789]{5}){5}$/
   const authCodeRegex = /^[ABCDEFGHJKLMNOPQRSTUVWXYZ23456789]{4}-[ABCDEFGHJKLMNOPQRSTUVWXYZ23456789]{5}-[ABCDEFGHJKLMNOPQRSTUVWXYZ23456789]{4}$/
 
-  if (!shareCodeRegex.test(sharecode)) {
+  if (sharecode && !shareCodeRegex.test(sharecode)) {
     statusError = 'Is not a valid sharecode'
     status = 418
     return [status, statusError]
   }
-  if (!authCodeRegex.test(authcode)) {
+  if (authcode === '' || !authCodeRegex.test(authcode)) {
     statusError = 'Is not a valid authcode'
     status = 418
     return [status, statusError]
diff --git a/src/views/Player.vue b/src/views/Player.vue
index 281f4c0..ed9d0d8 100644
--- a/src/views/Player.vue
+++ b/src/views/Player.vue
@@ -44,13 +44,13 @@
                   </td>
                 </tr>
               </table>
-              <div v-if="data.statusErrorCode === 200" class="alert alert-success" role="alert">
+              <div v-if="data.statusErrorCode === 202" class="alert alert-success" role="alert">
                 {{ data.statusError }}
               </div>
               <div v-if="data.statusErrorCode === 418" class="alert alert-warning" role="alert">
                 {{ data.statusError }}
               </div>
-              <div v-if="data.statusErrorCode !== 0 && data.statusErrorCode !== 200 && data.statusErrorCode !== 418"
+              <div v-if="data.statusErrorCode !== 0 && data.statusErrorCode !== 202 && data.statusErrorCode !== 418"
                    class="alert alert-danger"
                    role="alert">
                 {{ data.statusError }}
@@ -279,17 +279,17 @@ export default {
     }
 
     const TrackPlayer = async () => {
-      [data.statusErrorCode, data.statusError] = await TrackMe(data.playerDetails.steamid64, data.userData.authcode, data.userData.sharecode)
+      if (data.userData.authcode !== '') {
+        [data.statusErrorCode, data.statusError] = await TrackMe(data.playerDetails.steamid64, data.userData.authcode, data.userData.sharecode)
 
-      setTimeout(() => {
-        if (data.statusErrorCode === 202) {
-          data.statusErrorCode = 0
-          data.statusError = ''
-          data.tracked = true
-        }
-
-        window.location.reload()
-      }, 2000)
+        setTimeout(() => {
+          if (data.statusErrorCode === 202) {
+            data.statusErrorCode = 0
+            data.statusError = ''
+            data.tracked = true
+          }
+        }, 5000)
+      }
     }
 
     onMounted(() => {