diff --git a/client/src/components/Match/DetailedMatchTeam.vue b/client/src/components/Match/DetailedMatchTeam.vue
index d8a7dab..869bde7 100644
--- a/client/src/components/Match/DetailedMatchTeam.vue
+++ b/client/src/components/Match/DetailedMatchTeam.vue
@@ -177,7 +177,7 @@
               </Tooltip>
               <div class="ml-1 flex flex-col items-start justify-center leading-none">
                 <router-link
-                  v-if="player.summonerSpell1"
+                  v-if="!player.name.includes('-BOT')"
                   :to="{
                     name: 'summoner',
                     params: { region: $route.params.region, name: player.name },
@@ -186,13 +186,13 @@
                     'font-semibold text-yellow-400': account.id === player.summonerId,
                   }"
                   class="text-overflow w-[5.5rem] overflow-hidden whitespace-nowrap text-left text-xs text-white hover:text-blue-200"
-                  >{{ player.name.replace('-', '#') }}</router-link
+                  >{{ nameWithoutTagLine(player.name) }}</router-link
                 >
                 <div
                   v-else
                   class="text-overflow w-[5.5rem] overflow-hidden whitespace-nowrap text-left text-xs text-white"
                 >
-                  {{ player.name.replace('-', '#') }}
+                  {{ nameWithoutTagLine(player.name) }}
                 </div>
                 <div class="text-xxs text-teal-500">
                   {{ player.champion.name }}
@@ -309,6 +309,7 @@ import { mapActions, mapState } from 'vuex'
 import DotsLoader from '@/components/Common/DotsLoader.vue'
 import Tooltip from '@/components/Common/Tooltip.vue'
 import MatchItems from '@/components/Match/MatchItems.vue'
+import { nameWithoutTagLine } from '@/helpers/functions'
 
 export default {
   components: {
@@ -397,6 +398,7 @@ export default {
 
       this.displayRunes(player.perks)
     },
+    nameWithoutTagLine,
     ...mapActions('cdragon', ['displayRunes']),
   },
 }
diff --git a/client/src/components/Match/Match.vue b/client/src/components/Match/Match.vue
index 21110aa..27869ea 100644
--- a/client/src/components/Match/Match.vue
+++ b/client/src/components/Match/Match.vue
@@ -133,22 +133,22 @@
               class="ml-4 flex items-center leading-none"
             >
               <router-link
-                v-if="ally.account_id !== '0' && account.accountId !== ally.account_id"
+                v-if="ally.puuid !== 'BOT' && account.puuid !== ally.puuid"
                 @click.native="$event.stopImmediatePropagation()"
                 :to="{
                   name: 'summoner',
                   params: { region: $route.params.region, name: ally.name },
                 }"
-                :class="isSummonerProfile(ally.account_id)"
+                :class="isSummonerProfile(ally.puuid)"
                 class="text-overflow w-16 overflow-hidden whitespace-nowrap text-right text-xs font-medium hover:text-white"
-                >{{ ally.name.replace('-', '#') }}</router-link
-              >
+                >{{ nameWithoutTagLine(ally.name) }}
+              </router-link>
               <div
                 v-else
-                :class="isSummonerProfile(ally.account_id)"
+                :class="isSummonerProfile(ally.puuid)"
                 class="text-overflow w-16 overflow-hidden whitespace-nowrap text-right text-xs font-medium"
               >
-                {{ ally.name.replace('-', '#') }}
+                {{ nameWithoutTagLine(ally.name) }}
               </div>
               <div
                 :class="index !== 0 ? '-mt-1' : ''"
@@ -168,20 +168,20 @@
                 class="h-6 w-6 rounded-full bg-blue-1000 bg-cover bg-center"
               ></div>
               <router-link
-                v-if="data.enemyTeam[index].account_id !== '0'"
+                v-if="data.enemyTeam[index].puuid !== 'BOT'"
                 @click.native="$event.stopImmediatePropagation()"
                 :to="{
                   name: 'summoner',
                   params: { region: $route.params.region, name: data.enemyTeam[index].name },
                 }"
                 class="text-overflow ml-1 w-16 overflow-hidden whitespace-nowrap text-left text-xs font-medium text-blue-200 hover:text-white"
-                >{{ data.enemyTeam[index].name.replace('-', '#') }}</router-link
-              >
+                >{{ nameWithoutTagLine(data.enemyTeam[index].name) }}
+              </router-link>
               <div
                 v-else
                 class="text-overflow ml-1 w-16 overflow-hidden whitespace-nowrap text-left text-xs font-medium text-blue-200"
               >
-                {{ data.enemyTeam[index].name.replace('-', '#') }}
+                {{ nameWithoutTagLine(data.enemyTeam[index].name) }}
               </div>
             </div>
           </div>
@@ -218,6 +218,7 @@ import Tooltip from '@/components/Common/Tooltip.vue'
 import DetailedMatch from '@/components/Match/DetailedMatch.vue'
 import MatchItems from '@/components/Match/MatchItems.vue'
 import Ripple from '@/components/Common/Ripple.vue'
+import { nameWithoutTagLine } from '@/helpers/functions'
 
 export default {
   components: {
@@ -260,12 +261,13 @@ export default {
         this.matchDetails(this.data.matchId)
       }
     },
-    isSummonerProfile(account_id) {
+    isSummonerProfile(puuid) {
       return {
-        'font-bold text-white': this.account.accountId === account_id,
-        'text-blue-200': this.account.accountId !== account_id,
+        'font-bold text-white': this.account.puuid === puuid,
+        'text-blue-200': this.account.puuid !== puuid,
       }
     },
+    nameWithoutTagLine,
     ...mapActions('detailedMatch', ['matchDetails']),
   },
 }
diff --git a/client/src/components/Summoner/Overview/SummonerMates.vue b/client/src/components/Summoner/Overview/SummonerMates.vue
index 4a194c0..5bb3069 100644
--- a/client/src/components/Summoner/Overview/SummonerMates.vue
+++ b/client/src/components/Summoner/Overview/SummonerMates.vue
@@ -25,7 +25,7 @@
             <router-link
               :to="{ name: 'summoner', params: { region: $route.params.region, name: mate.name } }"
               class="w-2/4 truncate hover:text-teal-200"
-              >{{ mate.name.replace('-', '#') }}</router-link
+              >{{ nameWithoutTagLine(mate.name) }}</router-link
             >
             <div class="w-1/4">{{ mate.wins }} / {{ mate.losses }}</div>
             <div class="w-1/4">
@@ -67,6 +67,7 @@
 <script>
 import { mapState } from 'vuex'
 import Tooltip from '@/components/Common/Tooltip.vue'
+import { nameWithoutTagLine } from '@/helpers/functions'
 
 export default {
   components: {
@@ -103,6 +104,7 @@ export default {
     winrate(wins, count) {
       return (wins * 100) / count
     },
+    nameWithoutTagLine,
   },
 }
 </script>
diff --git a/client/src/helpers/functions.js b/client/src/helpers/functions.js
index 41ef6e2..bd48eba 100644
--- a/client/src/helpers/functions.js
+++ b/client/src/helpers/functions.js
@@ -52,3 +52,12 @@ export function createCDragonAssetUrl(iconPath) {
   const name = iconPath.split('/assets/')[1].toLowerCase()
   return `https://raw.communitydragon.org/latest/plugins/rcp-be-lol-game-data/global/default/${name}`
 }
+
+/**
+ * Remove tagLine from a name
+ * @param {String} name
+ */
+export function nameWithoutTagLine(name) {
+  const separator = name.lastIndexOf('-')
+  return separator === -1 ? name : name.slice(0, separator)
+}