diff --git a/src/components/game/gui/Clock.vue b/src/components/game/gui/Clock.vue
index cebb827..3a53e2c 100644
--- a/src/components/game/gui/Clock.vue
+++ b/src/components/game/gui/Clock.vue
@@ -1,20 +1,18 @@
 <template>
   <div class="absolute top-0 right-4 hidden lg:block">
-    <p class="text-white text-lg">{{ gameStore.world.date.toLocaleString() }}</p>
+    <p class="text-white text-lg">
+      {{ useDateFormat(gameStore.world.date ?? new Date(), 'YYYY:MM:DD HH:mm:ss') }}
+    </p>
   </div>
 </template>
 
 <script setup lang="ts">
 import { useGameStore } from '@/stores/gameStore'
+import { useDateFormat } from '@vueuse/core'
 import { onUnmounted } from 'vue'
 
 const gameStore = useGameStore()
 
-// Listen for new date from socket
-gameStore.connection?.on('date', (data: Date) => {
-  gameStore.world.date = new Date(data)
-})
-
 onUnmounted(() => {
   gameStore.connection?.off('date')
 })
diff --git a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
index 1767190..a116647 100644
--- a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
+++ b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
@@ -46,7 +46,7 @@ const previewPlacedMapObject = computed(() => ({
 
 function updatePreviewPosition(pointer: Phaser.Input.Pointer) {
   const tile = getTile(props.tileMap, pointer.worldX, pointer.worldY)
-  if (!tile || previewPosition.value.x === tile.x && previewPosition.value.y === tile.y) return
+  if (!tile || (previewPosition.value.x === tile.x && previewPosition.value.y === tile.y)) return
 
   previewPosition.value = { x: tile.x, y: tile.y }
 }
diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index 53cb6f4..1d5a64d 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -39,15 +39,6 @@ const password = ref('')
 const formError = ref('')
 const showPassword = ref(false)
 
-// automatic login because of development
-onMounted(async () => {
-  const token = useCookies().get('token')
-  if (token) {
-    gameStore.setToken(token)
-    gameStore.initConnection()
-  }
-})
-
 async function submit() {
   // check if username and password are valid
   if (username.value === '' || password.value === '') {
diff --git a/src/components/login/NewPasswordForm.vue b/src/components/login/NewPasswordForm.vue
index ff8ed31..3b6a8ee 100644
--- a/src/components/login/NewPasswordForm.vue
+++ b/src/components/login/NewPasswordForm.vue
@@ -34,15 +34,6 @@ const password = ref('')
 const newPasswordError = ref('')
 const showPassword = ref(false)
 
-// automatic login because of development
-onMounted(async () => {
-  const token = useCookies().get('token')
-  if (token) {
-    gameStore.setToken(token)
-    gameStore.initConnection()
-  }
-})
-
 async function newPasswordFunc() {
   // check if username and password are valid
   if (password.value === '') {
diff --git a/src/components/login/RegisterForm.vue b/src/components/login/RegisterForm.vue
index af5639c..90d3696 100644
--- a/src/components/login/RegisterForm.vue
+++ b/src/components/login/RegisterForm.vue
@@ -40,15 +40,6 @@ const email = ref('')
 const formError = ref('')
 const showPassword = ref(false)
 
-// automatic login because of development
-onMounted(async () => {
-  const token = useCookies().get('token')
-  if (token) {
-    gameStore.setToken(token)
-    gameStore.initConnection()
-  }
-})
-
 async function submit() {
   // check if username and password are valid
   if (username.value === '' || email.value === '' || password.value === '') {
diff --git a/src/components/screens/Login.vue b/src/components/screens/Login.vue
index eb07506..456b905 100644
--- a/src/components/screens/Login.vue
+++ b/src/components/screens/Login.vue
@@ -44,13 +44,4 @@ function switchToLogin() {
   currentForm.value = 'login'
   doesUrlHaveToken.value = false
 }
-
-// automatic login because of development
-onMounted(async () => {
-  const token = useCookies().get('token')
-  if (token) {
-    gameStore.setToken(token)
-    gameStore.initConnection()
-  }
-})
 </script>
diff --git a/src/stores/gameStore.ts b/src/stores/gameStore.ts
index 97d98b6..75fb55e 100644
--- a/src/stores/gameStore.ts
+++ b/src/stores/gameStore.ts
@@ -96,8 +96,17 @@ export const useGameStore = defineStore('game', {
       this.connection.on('reconnect_failed', () => {
         this.disconnectSocket()
       })
+
+      // Listen for new date from socket
+      this.connection.on('date', (data: Date) => {
+        this.world.date = new Date(data)
+      })
     },
     disconnectSocket() {
+      // Remove event listeners
+      this.connection?.off('connect_error')
+      this.connection?.off('reconnect_failed')
+      this.connection?.off('date')
       this.connection?.disconnect()
 
       useCookies().remove('token', {