diff --git a/Server/src/main/kotlin/rs09/game/content/dialogue/region/jatizso/TowerGuardDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/region/jatizso/TowerGuardDialogue.kt
index 1735eb293..c86d020b2 100644
--- a/Server/src/main/kotlin/rs09/game/content/dialogue/region/jatizso/TowerGuardDialogue.kt
+++ b/Server/src/main/kotlin/rs09/game/content/dialogue/region/jatizso/TowerGuardDialogue.kt
@@ -28,10 +28,10 @@ class TowerGuardDialogue(player: Player? = null) : DialoguePlugin(player) {
             1 -> playerl(FacialExpression.HALF_THINKING, "No need to shout.").also { stage++ }
             2 -> npc(FacialExpression.NEUTRAL, "I'M SORRY I'VE BEEN SHOUTING","INSULTS SO LONG I CAN'T HELP IT!").also { stage++ }
             3 -> playerl(FacialExpression.HALF_THINKING, "Who are you insulting?").also { stage++ }
-            4 -> npc(FacialExpression.NEUTRAL, "THE TOWER IN NEITIZNOT.","THEY SHOUT INSULTS BACK.").also { stage++ }
+            4 -> npc(FacialExpression.NEUTRAL, "THE TOWER IN ${if(npc.id == NPCs.GUARD_5489) "NEITIZNOT" else "JATIZSO"}.","THEY SHOUT INSULTS BACK.").also { stage++ }
             5 -> playerl(FacialExpression.ASKING, "Err, why?" ).also { stage++ }
-            6 -> npc(FacialExpression.NEUTRAL, "THE KING TELLS US TO.").also { stage++ }
-            7 -> playerl(FacialExpression.HALF_THINKING, "Your King is a strange person.").also { stage++ }
+            6 -> npc(FacialExpression.NEUTRAL, "THE ${if(npc.id == NPCs.GUARD_5489) "KING" else "BURGHER"} TELLS US TO.").also { stage++ }
+            7 -> playerl(FacialExpression.HALF_THINKING, "Your ${if(npc.id == NPCs.GUARD_5489) "King" else "Burgher"} is a strange person.").also { stage++ }
             8 -> options("Can I watch? I'm curious.", "Oh well, I'd better get going.").also { stage++ }
             9 -> when(buttonId){
                 1 -> playerl(FacialExpression.ASKING, "Can I watch? I'm curious.").also { stage++ }
diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/rellekka/JatizsoListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/region/rellekka/JatizsoListeners.kt
index 221de6ccf..ef36111a2 100644
--- a/Server/src/main/kotlin/rs09/game/interaction/region/rellekka/JatizsoListeners.kt
+++ b/Server/src/main/kotlin/rs09/game/interaction/region/rellekka/JatizsoListeners.kt
@@ -19,6 +19,7 @@ class JatizsoListeners : InteractionListener() {
     val WEST_GATE_ZONE = ZoneBorders(2386,3797,2390,3801)
     val SOUTH_GAE_ZONE = ZoneBorders(2411,3795,2414,3799)
     val BELL = 21394
+    val TOWER_GUARDS = intArrayOf(NPCs.GUARD_5490, NPCs.GUARD_5489)
     val GUARDS = intArrayOf(NPCs.GUARD_5491, NPCs.GUARD_5492)
     val KING_CHEST = intArrayOf(21299,21300)
     val LINES = arrayOf(
@@ -75,15 +76,15 @@ class JatizsoListeners : InteractionListener() {
             return@on true
         }
 
-        on(GUARDS, NPC, "watch-shouting"){player, node ->
-            val local = ContentAPI.findLocalNPC(player, node.id)
+        on(TOWER_GUARDS, NPC, "watch-shouting"){player, _ ->
+            val local = ContentAPI.findLocalNPC(player, NPCs.GUARD_5489)
             ContentAPI.lock(player, 200)
             ContentAPI.face(local!!, Location.create(2371, 3801, 2))
             local.asNpc().isRespawn = false
             ContentAPI.submitIndividualPulse(player, object : Pulse(4){
-                var id = node.id
+                var id = NPCs.GUARD_5489
                 var counter = 0
-                val other = ContentAPI.findLocalNPC(player, getOther(node.id))
+                val other = ContentAPI.findLocalNPC(player, getOther(NPCs.GUARD_5489))
 
                 override fun start() {
                     other?.isRespawn = false
@@ -92,12 +93,12 @@ class JatizsoListeners : InteractionListener() {
                 override fun pulse(): Boolean {
                     val npc = ContentAPI.findLocalNPC(player, id) ?: return false
                     val index = when(id){
-                        node.id -> 0
+                        NPCs.GUARD_5489 -> 0
                         else -> 1
                     }
                     if(index == 1 && counter == 5) return true
                     ContentAPI.sendChat(npc, LINES[index][counter])
-                    if(npc.id != node.id) counter++
+                    if(npc.id != NPCs.GUARD_5489) counter++
                     id = getOther(id)
                     return false
                 }