diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue
index d2f4d98..8fd52b2 100644
--- a/app/src/plugins/app/_config/App.vue
+++ b/app/src/plugins/app/_config/App.vue
@@ -10,7 +10,7 @@
 
 	<Z-task-modal 				ref="z-task-modal" 					@on-subtask-edited="onTaskEdited" />
 	<Z-delete-task-modal 		ref="z-delete-task-modal" 			@on-task-deleted="onTaskDeleted" />
-	<Z-delete-master-task-modal ref="z-delete-master-task-modal" 	@on-master-task-deleted="onMasterTaskDeleted" />
+	<Z-delete-master-task-modal ref="z-delete-master-task-modal" 	@on-mastertask-deleted="onMasterTaskDeleted" />
 	<Z-complete-task-modal 		ref="z-complete-task-modal" 		@on-subtask-edited="onTaskEdited" />
 	<Z-task-add-time-modal 		ref="z-task-add-time-modal" />
 	<Z-blocker-modal 			ref="z-blocker-modal" />
@@ -114,7 +114,7 @@ export default {
 		},
 
 		onMasterTaskDeleted(mastertask){
-			this.$events.emit('on-master-task-deleted', mastertask)
+			this.$events.emit('on-mastertask-deleted', mastertask)
 		},
 
 		onMasterTaskEdited(mastertask){
@@ -124,9 +124,9 @@ export default {
 
 	watch: {
 		'$route'() {
-			if (this.$route.query['master-task']) {
-				this.$events.emit('show-master-task-modal', { mastertask: { id: this.$route.query['master-task'] }, editMode: false })
-			}
+			// if (this.$route.query['master-task']) {
+			// 	this.$events.emit('show-master-task-modal', { mastertask: { id: this.$route.query['master-task'] }, editMode: false })
+			// }
 		}
 	}
 }
diff --git a/app/src/plugins/lib@auth/login/_components/a-login-form.vue b/app/src/plugins/lib@auth/login/_components/a-login-form.vue
index cda2370..3914ff5 100644
--- a/app/src/plugins/lib@auth/login/_components/a-login-form.vue
+++ b/app/src/plugins/lib@auth/login/_components/a-login-form.vue
@@ -22,10 +22,11 @@ export default {
 		return {
 			errorUtils,
 			v$: useVuelidate(),
-			form: {
-				email: 'zachariah.vonrueden@jandl.sk',
-				password: 'testpassword'
-			},
+			form: {},
+			// form: {
+			// 	email: 'zachariah.vonrueden@jandl.sk',
+			// 	password: 'testpassword'
+			// },
 			showPassword: false
 		}
 	},
diff --git a/app/src/plugins/tm@dashboard/projects/projects.vue b/app/src/plugins/tm@dashboard/projects/projects.vue
index c762b58..fd8c4ea 100644
--- a/app/src/plugins/tm@dashboard/projects/projects.vue
+++ b/app/src/plugins/tm@dashboard/projects/projects.vue
@@ -46,6 +46,16 @@ export default {
 		}
 	},
 
+	mounted() {
+		this.$events.on('on-mastertask-edited', () => this.onFilterChanged(this.filter))
+		this.$events.on('on-mastertask-deleted', () => this.onFilterChanged(this.filter))
+	},
+
+	unmounted() {
+		this.$events.off('on-mastertask-edited')
+		this.$events.off('on-mastertask-deleted')
+	},
+
 	methods: {
 		async onFilterChanged(filter) {
 			this.mastertasks = null
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue b/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue
index dbf4411..79242bc 100644
--- a/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue
+++ b/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue
@@ -21,12 +21,22 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+
 export default {
 	props: {
-		employee: {
-			type: [Object, Number],
+		employeeId: {
+			type: [Number],
 			required: false
 		}
+	},
+
+	computed: {
+		...mapGetters('tm', ['enrichedEmployees']),
+
+		employee() {
+			return this.enrichedEmployees.find(employee => employee.id == this.employeeId)
+		}
 	}
 }
 </script>
\ No newline at end of file
diff --git a/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue b/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue
index 43f3bb8..30abd81 100644
--- a/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue
+++ b/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue
@@ -1,7 +1,7 @@
 <template>
 	<Z-status 				:status="mastertask.is_finished" />
 	<Z-deadline 			:deadline="mastertask.deadline" />
-	<Z-created-by 			:employee="mastertask.created_by" />
+	<Z-created-by 			:employee-id="mastertask.created_by" />
 	<Z-team 				:team="mastertask.team" :employees="mastertask.employees" />
 	<Z-planned-time        	:hours="mastertask.duration" />
     <Z-remaining-time      	:hours="mastertask.duration - mastertask.time_worked" />
diff --git a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
index 31170b2..ce31ef8 100644
--- a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
+++ b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
@@ -55,8 +55,8 @@ export default {
 	},
 
 	watch: {
-		'mastertask.team_id'(value, oldValue) {
-			if (!value || !oldValue) return
+		'mastertask.team_id'(value) {
+			if (!value) return
 			
 			this.mastertask.team 		= this.teams.find(team => team.id == value)
 			this.mastertask.employees   = this.mastertask.team.employees
diff --git a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
index c85f3d8..f939e36 100644
--- a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
@@ -21,7 +21,7 @@
 
 <script>
 export default {
-	emits: ['on-master-task-deleted'],
+	emits: ['on-mastertask-deleted'],
 
 	data() {
 		return {
@@ -43,7 +43,7 @@ export default {
 		async deleteMasterTask() {
 			try {
 				await this.$axios.delete_auth(`v1/mastertasks/${this.mastertask.id}`)
-				this.$emit('on-master-task-deleted', this.mastertask)
+				this.$emit('on-mastertask-deleted', this.mastertask)
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)
diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
index 6fc4965..f11839a 100644
--- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
@@ -143,7 +143,7 @@ export default {
 	},
 
 	mounted() {
-		this.$events.on('on-master-task-deleted', (mastertask) => {
+		this.$events.on('on-mastertask-deleted', (mastertask) => {
 			if (mastertask?.id == this.mastertask?.id) this.closeModal()
 		})
 
@@ -164,7 +164,7 @@ export default {
 	},
 
 	beforeUnmount() {
-		this.$events.off('on-master-task-deleted')
+		this.$events.off('on-mastertask-deleted')
 		this.$events.off('on-task-deleted')
 		this.$events.off('on-subtask-edited')
 	},
diff --git a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
index c0d531f..19fb862 100644
--- a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
+++ b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
@@ -2,7 +2,7 @@
 	<A-mastertask-name      	:name="task.master_task?.name || task.master_task" :id="task.master_task.id" :color="task.master_task.color" @close-modal="$emit('close-modal')" />
     <A-mastertask-status    	:status="task.is_finished" />
 	<A-task-timeblocks			:timeblocks="task.timeblocks" :task="task" />
-    <A-task-assigned-by  		:employee="task._created_by" v-if="task._created_by" />
+    <Z-created-by 				:employee-id="task.created_by" />
     <A-task-assigned-employee  	:employee="task.employee" />
     <A-task-planned-time        :hours="task.duration" />
     <A-task-remaining-time      :hours="task.duration - task.spent_time" />
@@ -15,7 +15,7 @@
 import AMastertaskName          from './_components/a-mastertask-name.vue'
 import AMastertaskStatus        from './_components/a-mastertask-status.vue'
 import ATaskTimeblocks    		from './_components/a-task-timeblocks.vue'
-import ATaskAssignedBy    		from './_components/a-task-assigned-by.vue'
+import ZCreatedBy    			from '../../_components/read-only/z-created-by.vue'
 import ATaskAssignedEmployee    from './_components/a-task-assigned-employee.vue'
 import ATaskPlannedTime         from './_components/a-task-planned-time.vue'
 import ATaskSpentTime           from './_components/a-task-spent-time.vue'
@@ -31,7 +31,7 @@ export default {
         AMastertaskName,
         AMastertaskStatus,
 		ATaskTimeblocks,
-		ATaskAssignedBy,
+		ZCreatedBy,
         ATaskAssignedEmployee,
         ATaskPlannedTime,
         ATaskSpentTime,