diff --git a/src/app/join-room/join-room.component.html b/src/app/join-room/join-room.component.html
index d491d9e40da161bf67b0292fcc1647adf64d4feb..5a70e3b89765f1e6a7c805946632b554cccf9ff6 100644
--- a/src/app/join-room/join-room.component.html
+++ b/src/app/join-room/join-room.component.html
@@ -10,5 +10,5 @@
         <mat-icon>send</mat-icon>
       </button>
     </div>
-    <button mat-button color="primary" (click)="joinDemo()">Join demo room <mat-icon>lightbulb_outline</mat-icon></button>
 </form>
+<button mat-button color="primary" (click)="joinDemo()">Join demo room <mat-icon>lightbulb_outline</mat-icon></button>
diff --git a/src/app/room-modification/room-modification.component.html b/src/app/room-modification/room-modification.component.html
index e5b25370e0e7f0822a0a0973f865ada6f851b9a0..ec6dd5b7802775a7bc62b9958df6c6888bb5a74c 100644
--- a/src/app/room-modification/room-modification.component.html
+++ b/src/app/room-modification/room-modification.component.html
@@ -3,7 +3,7 @@
     <input [(ngModel)]="editRoom.name" #roomName matInput/>
   </mat-form-field>
   <mat-form-field class="input-block">
-    <input [(ngModel)]="editRoom.shortId" #roomShortID matInput/>
+    <input [(ngModel)]="editRoom.abbreviation" #roomAbbreviation matInput/>
   </mat-form-field>
   <mat-form-field class="input-block">
             <textarea [(ngModel)]="editRoom.description" #roomDescription matInput matTextareaAutosize
diff --git a/src/app/room.service.ts b/src/app/room.service.ts
index 6d04fa33894e09d1ab6ca561a3bc76cb1b2cf301..2a1f4926a91a3c7acbff16643848a1ab70d5a1ee 100644
--- a/src/app/room.service.ts
+++ b/src/app/room.service.ts
@@ -66,10 +66,10 @@ export class RoomService extends ErrorHandlingService {
   }
 
   updateRoom(room: Room): Observable<Room> {
-    const connectionUrl = `${this.apiBaseUrl}${this.roomsUrl}/${room.id}`;
+    const connectionUrl = `${this.apiBaseUrl}${this.roomsUrl}/~${room.shortId}`;
     return this.http.put(connectionUrl, {
-      shortId: room.shortId, ownerId: this.authService.getUser().userId,
-      abbreviation: room.abbreviation, name: room.name, closed: room.closed, description: room.description
+      ownerId: this.authService.getUser().userId,
+      abbreviation: room.abbreviation, name: room.name, description: room.description
     }, httpOptions).pipe(
       tap(_ => ''),
       catchError(this.handleError<any>('updateRoom'))