diff --git a/frontend/src/components/assignments/GroupSelector.vue b/frontend/src/components/assignments/GroupSelector.vue
index 1014c119..c10645c6 100644
--- a/frontend/src/components/assignments/GroupSelector.vue
+++ b/frontend/src/components/assignments/GroupSelector.vue
@@ -406,7 +406,7 @@ function removeStudent(groupIndex: number, student: StudentItem): void {
                             <v-btn
                                 color="primary"
                                 @click="generateRandomGroups"
-                                :disabled="groupSize < 1"
+                                :disabled="groupSize < 1 || groupSize > allStudents.length"
                                 block
                             >
                                 {{ t("generate-groups") }}
diff --git a/frontend/src/views/assignments/TeacherAssignment.vue b/frontend/src/views/assignments/TeacherAssignment.vue
index 640068f2..34ac1948 100644
--- a/frontend/src/views/assignments/TeacherAssignment.vue
+++ b/frontend/src/views/assignments/TeacherAssignment.vue
@@ -144,6 +144,7 @@ async function saveChanges(): Promise<void> {
 }
 
 async function handleGroupsUpdated(updatedGroups: string[][]): Promise<void> {
+    console.log(updatedGroups);
     const assignmentDTO: AssignmentDTO = {
         groups: updatedGroups,
     };