diff --git a/client/src/components/FilterBar.vue b/client/src/components/FilterBar.vue
index b1fcfc7c..7ba17a53 100644
--- a/client/src/components/FilterBar.vue
+++ b/client/src/components/FilterBar.vue
@@ -44,7 +44,7 @@
         return this.$getRidOfEdges(this.me.schoolClasses);
       },
       isTeacher() {
-        return this.me.role === 'teacher';
+        return this.me.permissions.includes('users.can_manage_school_class_content');
       }
     },
 
diff --git a/client/src/components/rooms/RoomForm.vue b/client/src/components/rooms/RoomForm.vue
index dabad6ee..ab1fc739 100644
--- a/client/src/components/rooms/RoomForm.vue
+++ b/client/src/components/rooms/RoomForm.vue
@@ -12,7 +12,6 @@
         class="skillbox-input room-form__input"
         id="room-class"
         v-model="localRoom.schoolClass"
-        @change="classSelectionChanged"
       >
         <option disabled value="">-</option>
         <option
@@ -56,14 +55,16 @@
     data() {
       return {
         localRoom: Object.assign({}, this.room),
-        me: {},
-        noClassSelected: true
+        me: {}
       }
     },
 
     computed: {
       schoolClasses() {
         return this.$getRidOfEdges(this.me.schoolClasses);
+      },
+      noClassSelected() {
+        return this.localRoom.schoolClass.id === undefined;
       }
     },
 
@@ -71,9 +72,6 @@
       updateColor(newColor) {
         this.localRoom.appearance = newColor;
         this.$store.dispatch('setSpecialContainerClass', newColor);
-      },
-      classSelectionChanged() {
-        this.noClassSelected = this.localRoom.schoolClass.id === undefined;
       }
     },
 
diff --git a/client/src/pages/rooms.vue b/client/src/pages/rooms.vue
index d945492c..b2fb4073 100644
--- a/client/src/pages/rooms.vue
+++ b/client/src/pages/rooms.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="rooms-page">
     <room-widget v-for="room in filteredRooms" v-bind="room" :key="room.name"></room-widget>
-    <add-room v-if="me.role === 'teacher'"></add-room>
+    <add-room v-if="canAddRoom"></add-room>
   </div>
 </template>
 
@@ -24,6 +24,9 @@
       },
       currentFilter() {
         return this.$store.state.filterForSchoolClass;
+      },
+      canAddRoom(){
+        this.me.permissions.includes('users.can_manage_school_class_content')
       }
     },
 
diff --git a/server/rooms/mutations.py b/server/rooms/mutations.py
index 5f42aa2f..f07e2816 100644
--- a/server/rooms/mutations.py
+++ b/server/rooms/mutations.py
@@ -37,7 +37,7 @@ class AddRoom(MutateRoom):
     @classmethod
     def mutate_and_get_payload(cls, root, info, **kwargs):
 
-        if info.context.user.user_roles.first().role.key != 'teacher':
+        if not info.context.user.has_perm('users.can_manage_school_class_content'):
             return cls(room=None, errors=['not allowed'])
 
         room_data = kwargs.get('room')