diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-by.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-by.vue
index 8d9b35b..0f7d82b 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-by.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-by.vue
@@ -14,7 +14,7 @@
 				<p class="employee-selected-avatar d-flex justify-center align-center">
 					{{ employee.name.charAt(0) + employee.surname.charAt(0) }}
 				</p>
-				<p class="ml-2" v-html="`${employee.name} ${employee.surname}`" />
+				<p class="ml-2">{{  employee._fullName }}</p>
 			</v-sheet>
 		</v-col>
 	</v-row>
@@ -25,13 +25,7 @@ export default {
     props: {
         employee: {
             type: Object,
-            // required: true,
-
-			// TODO Remove
-			default: () => ({
-				name: 'Zachariach',
-				surname: 'VonRunden (MOCK)'
-			})
+            required: true
         }
     }
 }
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 b352618..930afe0 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.assigned_by" />
+    <A-task-assigned-by  		:employee="task._created_by" v-if="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" />
diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue
index e1e2a1d..e23cac8 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -226,6 +226,7 @@ export default {
 		_enrichTask(task) {
 			task.master_task 		= this.mastertasks.find((masterTask) => masterTask.id == task.master_task_id)
 			task.employee 			= this.enrichedEmployees.find((employee) => employee.id == task.employee_id)
+			task._created_by 		= this.enrichedEmployees.find((employee) => employee.id == task.created_by)
 			this.masterTaskIdSelect = task.master_task?.id
 
 			return task
diff --git a/app/src/plugins/w/auth/auth.store.ts b/app/src/plugins/w/auth/auth.store.ts
index 7472887..59aa035 100644
--- a/app/src/plugins/w/auth/auth.store.ts
+++ b/app/src/plugins/w/auth/auth.store.ts
@@ -37,7 +37,6 @@ export default {
 			return new Promise((resolve, reject) => {
 				axios.post('v1/tokens/create', {data: credentials})
 					.then((response: any) => {
-						console.log(response)
 						const token = response.token
 						const user = response.user