diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index f712169653107d5b3cea21d62043e17d18d9297f..0133d622a72a809110a0980b6d68f5334ef46783 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,6 +4,7 @@ import { NgModule } from '@angular/core';
 
 import { AppComponent } from './app.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { JoinRoomComponent } from './join-room/join-room.component';
 import { LoginComponent } from './login/login.component';
 import { RegisterComponent } from './register/register.component';
 import { PasswordResetComponent } from './password-reset/password-reset.component';
@@ -53,6 +54,8 @@ import { AuthenticationGuard } from './authentication.guard';
 
 @NgModule({
   declarations: [
+    AppComponent,
+    JoinRoomComponent,
     AppComponent,
     LoginComponent,
     LoginScreenComponent,
@@ -69,6 +72,9 @@ import { AuthenticationGuard } from './authentication.guard';
     AppRoutingModule,
     BrowserModule,
     BrowserAnimationsModule,
+    MatButtonModule,
+    MatInputModule
+    BrowserAnimationsModule,
     FlexLayoutModule,
     FormsModule,
     MatAutocompleteModule,
diff --git a/src/app/join-room/join-room.component.html b/src/app/join-room/join-room.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..c2b0d901866d6d7d2782299c08fc3ee7a268a8d1
--- /dev/null
+++ b/src/app/join-room/join-room.component.html
@@ -0,0 +1,6 @@
+<form>
+  <mat-form-field class="input-block">
+    <input matInput placeholder="Room-Id" />
+  </mat-form-field>
+  <button mat-raised-button color="primary">Join</button>
+</form>
diff --git a/src/app/join-room/join-room.component.scss b/src/app/join-room/join-room.component.scss
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/app/join-room/join-room.component.spec.ts b/src/app/join-room/join-room.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..511e4a166b50eb9b29237930c9182988839e9c90
--- /dev/null
+++ b/src/app/join-room/join-room.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { JoinRoomComponent } from './join-room.component';
+
+describe('JoinRoomComponent', () => {
+  let component: JoinRoomComponent;
+  let fixture: ComponentFixture<JoinRoomComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ JoinRoomComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(JoinRoomComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/join-room/join-room.component.ts b/src/app/join-room/join-room.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ad5b3670d8225fe93f2eda9cedfb87477c1a3ac9
--- /dev/null
+++ b/src/app/join-room/join-room.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-join-room',
+  templateUrl: './join-room.component.html',
+  styleUrls: ['./join-room.component.scss']
+})
+export class JoinRoomComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}