diff --git a/app/src/plugins/app/_layout/app/_components/a-header.vue b/app/src/plugins/app/_layout/app/_components/a-header.vue
index 1e62b1b..68fc187 100644
--- a/app/src/plugins/app/_layout/app/_components/a-header.vue
+++ b/app/src/plugins/app/_layout/app/_components/a-header.vue
@@ -29,11 +29,11 @@
 						<v-btn class="menu-dropdown" v-bind="props">
 							<div class="d-flex justify-between align-center">
 								<p class="employee-select-avatar d-flex justify-center align-center" @click.stop="$router.push({name: 'Dashboard - User'})">
-									{{ user.name?.charAt(0) || '' + user.surname?.charAt(0) || '' }}
+									{{ user.firstname.charAt(0) }}{{ user.lastname.charAt(0) }}
 								</p>
 
 								<div>
-									<span class="employee-name ml-4">{{ `${user.name} ${user.surname || ''}` }}</span>
+									<span class="employee-name ml-4">{{ `${user.firstname} ${user.lastname || ''}` }}</span>
 									<v-icon class="ml-3" icon="mdi-chevron-down" size="x-small"></v-icon>
 								</div>
 							</div>
diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue
index 7687d26..60998c5 100644
--- a/app/src/plugins/tm@dashboard/tasks/tasks.vue
+++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue
@@ -94,7 +94,8 @@ export default {
 	},
 
 	unmounted() {
-		this.$events.off('on-user-updated')
+		this.$events.off('on-subtask-edited')
+		this.$events.off('on-subtask-deleted')
 	},
 
 	methods: {
diff --git a/app/src/plugins/tm@profile/profile/my-profile.vue b/app/src/plugins/tm@profile/profile/my-profile.vue
index 03a7fb6..c6384d7 100644
--- a/app/src/plugins/tm@profile/profile/my-profile.vue
+++ b/app/src/plugins/tm@profile/profile/my-profile.vue
@@ -1,8 +1,8 @@
 <template>
 	<div class="border-bottom py-5 px-5">
 		<h1>Všeobecné informácie</h1>
-		<v-text-field class="w-75" variant="solo" label="Meno" :disabled="true" v-model="user.name"></v-text-field>
-		<v-text-field class="w-75" variant="solo" label="Priezvisko" v-model="user.surname" :disabled="true"></v-text-field>
+		<v-text-field class="w-75" variant="solo" label="Meno" :disabled="true" v-model="user.firstname"></v-text-field>
+		<v-text-field class="w-75" variant="solo" label="Priezvisko" v-model="user.lastname" :disabled="true"></v-text-field>
 	</div>
 	<div class="py-5 px-5 border-bottom">
 		<h1>Pracovná doba</h1>
@@ -59,7 +59,6 @@ export default {
 			try {
 				await this.$store.dispatch('auth/updateUserInfo', data)
 				this.$toast.success('Profil bol úspešne zmenený')
-				this.$events.emit('on-user-updated', this.user)
 			} catch (error) {
 				this.$toast.error(error)
 			}