diff --git a/frontend/src/views/assignments/StudentAssignment.vue b/frontend/src/views/assignments/StudentAssignment.vue
index 2427e7c3..f0fe8080 100644
--- a/frontend/src/views/assignments/StudentAssignment.vue
+++ b/frontend/src/views/assignments/StudentAssignment.vue
@@ -152,10 +152,10 @@
                     </v-card-text>
                 </v-card-text>
 
-                <v-card-text class="group-section">
-                    <h3>{{ t("group") }}</h3>
+                <v-card-text class="group-section" v-if="group && studentQueries">
+                    <h3>{{ `${t("group")} ${group.groupNo}` }}</h3>
 
-                    <div v-if="group && studentQueries">
+                    <div>
                         <ul>
                             <li
                                 v-for="student in group.members"
@@ -165,8 +165,10 @@
                             </li>
                         </ul>
                     </div>
-
-                    <div v-else>
+                </v-card-text>
+                <v-card-text class="group-section" v-else>
+                    <h3>{{ t("group") }}</h3>
+                    <div>
                         <v-alert class="empty-message">
                             <v-icon
                                 icon="mdi-information-outline"
diff --git a/frontend/src/views/assignments/UserAssignments.vue b/frontend/src/views/assignments/UserAssignments.vue
index 78cf6281..e2fc03c0 100644
--- a/frontend/src/views/assignments/UserAssignments.vue
+++ b/frontend/src/views/assignments/UserAssignments.vue
@@ -199,6 +199,10 @@
                 <v-row v-if="allAssignments.length === 0">
                     <v-col cols="12">
                         <div class="no-assignments">
+                            <v-icon
+                                icon="mdi-information-outline"
+                                size="small"
+                            />
                             {{ t("no-assignments") }}
                         </div>
                     </v-col>