diff --git a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue
index 9da6e5c..82c7c23 100644
--- a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue
+++ b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue
@@ -4,7 +4,7 @@
 			v-model="selectedEmployee"
 			class="subheader-input"
 			:items="employees"
-			item-title="name"
+			item-title="fullName"
 			item-value="id"
 			label="Zamestnanec"
 			variant="outlined"
@@ -31,6 +31,7 @@
 
 <script>
 import { addDays, subDays } from 'date-fns'
+import { mapGetters } from 'vuex'
 
 export default {
 	props: {
@@ -54,6 +55,8 @@ export default {
 	},
 	
 	computed: {
+		...mapGetters('auth', ['user']),
+
 		time() {
 			return this.unscheduledTime
 		}
@@ -74,6 +77,10 @@ export default {
 
 		async _getEmployees() {
 			this.employees =  await this.$axios.get_auth_data('v1/employees')
+			this.employees.forEach(employee => {
+				employee.fullName = `${employee.name} ${employee.surname}`
+				if (employee.id == this.user.id) this.selectedEmployee = employee
+			})
 		},
 
 		_getWeek(emitDataChanged = true) {
diff --git a/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue b/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue
index f7c59db..5f9a204 100644
--- a/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue
+++ b/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue
@@ -31,7 +31,6 @@
 
 <script>
 import { addDays, subDays } from 'date-fns'
-import { mapGetters } from 'vuex'
 
 export default {
 	props: {
@@ -48,7 +47,7 @@ export default {
 			teams: [],
 
 			// Kaluza: Napojit funkcionalitu
-			selectedTeam: '',
+			selectedTeam: null,
 
 			selectedDate: new Date(),
 			day: new Date(),
@@ -57,8 +56,6 @@ export default {
 	},
 
 	computed: {
-		...mapGetters('auth', ['user']),
-		
 		time() {
 			return this.unscheduledTime
 		},
@@ -79,7 +76,7 @@ export default {
 
 		async _getTeams() {
 			this.teams =  await this.$axios.get_auth_data('v1/teamsx')
-			// this.selectedTeam()
+			this.selectedTeam = this.teams[0]
 		},
 
 		_getDay(emitDataChanged = true) {