diff --git a/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
index 8970b4fc..226bc13f 100644
--- a/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
@@ -52,8 +52,9 @@
                         <div class="all-message-box scrollable">
                             <div class="message-box" v-for="(n, index) in noteMaintenance" :key="index" v-if="noteMaintenance && noteMaintenance.length > 0 && index < limitationList" :class="{selected: selectedNoteMaintenance == n}" @click="onClickSelectNote(n)">
                                 <div class="message-box-header">
-                                    <div v-if="n.user.username == currentUser.username" class="avatar">{{n.user.firstName.split(' ').map(function (s) { return s.charAt(0); }).join('')}}{{n.user.lastName.split(' ').map(function (s) { return s.charAt(0); }).join('')}}</div>
+                                    <div v-if="currentUser && n.user.username != currentUser.username" class="avatar">{{n.user.firstName.split(' ').map(function (s) { return s.charAt(0); }).join('')}}{{n.user.lastName.split(' ').map(function (s) { return s.charAt(0); }).join('')}}</div>
                                     <textarea :disabled="isDisabled(n)" class="text-message" v-model="n.message"></textarea>
+                                    <div v-if="currentUser && n.user.username == currentUser.username" class="avatar">{{n.user.firstName.split(' ').map(function (s) { return s.charAt(0); }).join('')}}{{n.user.lastName.split(' ').map(function (s) { return s.charAt(0); }).join('')}}</div>
                                 </div>
                                 <div v-if="selectedNoteMaintenance == n && enableModifyNote" class="message-box-body">
                                     <label class="text-date">{{'maintenance_card_label_date_note_add' | localize("Aggiunta il ")}}{{convertDate(n.dateTime)}}{{'maintenance_card_label_date_note_at_time' | localize(" alle ")}}{{convertDateToTime(n.dateTime)}}</label>