diff --git a/frontend/src/app/components/students/student-register/student-register.component.html b/frontend/src/app/components/students/student-register/student-register.component.html
index d03b015..79d4129 100644
--- a/frontend/src/app/components/students/student-register/student-register.component.html
+++ b/frontend/src/app/components/students/student-register/student-register.component.html
@@ -1,168 +1,164 @@
-<!--<button mat-raised-button (click)="isEditable = !isEditable">-->
-<!--  {{!isEditable ? 'Enable edit mode' : 'Disable edit mode'}}-->
-<!--</button>-->
-
 <mat-stepper>
   <!--  Step 1-->
-<!--  <mat-step [stepControl]="firstFormGroup" class="firstStep">-->
-<!--    <form [formGroup]="firstFormGroup" class="flexContainerRow width50">-->
-<!--      <ng-template matStepLabel>Persönliche Informationen</ng-template>-->
-<!--      <div class="leftContainer">-->
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Name</mat-label>-->
-<!--          <input-->
-<!--            matInput-->
-<!--            formControlName="firstName"-->
-<!--            placeholder="First name"-->
-<!--            required />-->
-<!--        </mat-form-field>-->
+  <mat-step [stepControl]="firstFormGroup" class="firstStep">
+    <form [formGroup]="firstFormGroup" class="flexContainerRow width50">
+      <ng-template matStepLabel>Persönliche Informationen</ng-template>
+      <div class="leftContainer">
+        <mat-form-field appearance="fill">
+          <mat-label>Name</mat-label>
+          <input
+            matInput
+            formControlName="firstName"
+            placeholder="First name"
+            required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Nachname</mat-label>-->
-<!--          <input-->
-<!--            matInput-->
-<!--            formControlName="lastName"-->
-<!--            placeholder="Last name"-->
-<!--            required />-->
-<!--        </mat-form-field>-->
+        <mat-form-field appearance="fill">
+          <mat-label>Nachname</mat-label>
+          <input
+            matInput
+            formControlName="lastName"
+            placeholder="Last name"
+            required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Geburtstag</mat-label>-->
-<!--          <input-->
-<!--            matInput-->
-<!--            [matDatepicker]="birthdatePicker"-->
-<!--            formControlName="birthdate"-->
-<!--            required />-->
-<!--          <mat-hint>MM.DD.YYYY</mat-hint>-->
-<!--          <mat-datepicker-toggle-->
-<!--            matSuffix-->
-<!--            [for]="birthdatePicker"></mat-datepicker-toggle>-->
-<!--          <mat-datepicker-->
-<!--            #birthdatePicker-->
-<!--            startView="multi-year"></mat-datepicker>-->
-<!--        </mat-form-field>-->
+        <mat-form-field appearance="fill">
+          <mat-label>Geburtstag</mat-label>
+          <input
+            matInput
+            [matDatepicker]="birthdatePicker"
+            formControlName="birthdate"
+            required />
+          <mat-hint>MM.DD.YYYY</mat-hint>
+          <mat-datepicker-toggle
+            matSuffix
+            [for]="birthdatePicker"></mat-datepicker-toggle>
+          <mat-datepicker
+            #birthdatePicker
+            startView="multi-year"></mat-datepicker>
+        </mat-form-field>
 
-<!--        <mat-form-field>-->
-<!--          <mat-label>Geschlecht</mat-label>-->
-<!--          <mat-select>-->
-<!--            <mat-option value="male">männlich</mat-option>-->
-<!--            <mat-option value="female">weiblich</mat-option>-->
-<!--            <mat-option value="divers">divers</mat-option>-->
-<!--          </mat-select>-->
-<!--        </mat-form-field>-->
-<!--      </div>-->
-<!--      <div class="rightContainer">-->
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Adresse</mat-label>-->
-<!--          <input matInput formControlName="address" required />-->
-<!--        </mat-form-field>-->
+        <mat-form-field>
+          <mat-label>Geschlecht</mat-label>
+          <mat-select>
+            <mat-option value="male">männlich</mat-option>
+            <mat-option value="female">weiblich</mat-option>
+            <mat-option value="divers">divers</mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="rightContainer">
+        <mat-form-field appearance="fill">
+          <mat-label>Adresse</mat-label>
+          <input matInput formControlName="address" required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Postleitzahl</mat-label>-->
-<!--          <input matInput formControlName="postalCode" required />-->
-<!--        </mat-form-field>-->
+        <mat-form-field appearance="fill">
+          <mat-label>Postleitzahl</mat-label>
+          <input matInput formControlName="postalCode" required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Telefon</mat-label>-->
-<!--          <input matInput formControlName="phone" required />-->
-<!--        </mat-form-field>-->
+        <mat-form-field appearance="fill">
+          <mat-label>Telefon</mat-label>
+          <input matInput formControlName="phone" required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>E-Mail</mat-label>-->
-<!--          <input matInput formControlName="email" required />-->
-<!--          <mat-error>Ungültige E-Mail Adresse</mat-error>-->
-<!--        </mat-form-field>-->
-<!--      </div>-->
-<!--    </form>-->
-<!--    <div class="buttonsContainer">-->
-<!--      <button mat-button matStepperPrevious class="backButton">Zurück</button>-->
-<!--      <button-->
-<!--        mat-button-->
-<!--        matStepperNext-->
-<!--        [disabled]="firstFormGroup.status == 'INVALID'">-->
-<!--        Weiter-->
-<!--      </button>-->
-<!--    </div>-->
-<!--  </mat-step>  <mat-step [stepControl]="firstFormGroup" class="firstStep">-->
-<!--    <form [formGroup]="firstFormGroup" class="flexContainerRow width50">-->
-<!--      <ng-template matStepLabel>Persönliche Informationen</ng-template>-->
-<!--      <div class="leftContainer">-->
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Name</mat-label>-->
-<!--          <input-->
-<!--            matInput-->
-<!--            formControlName="firstName"-->
-<!--            placeholder="First name"-->
-<!--            required />-->
-<!--        </mat-form-field>-->
+        <mat-form-field appearance="fill">
+          <mat-label>E-Mail</mat-label>
+          <input matInput formControlName="email" required />
+          <mat-error>Ungültige E-Mail Adresse</mat-error>
+        </mat-form-field>
+      </div>
+    </form>
+    <div class="buttonsContainer">
+      <button mat-button matStepperPrevious class="backButton">Zurück</button>
+      <button
+        mat-button
+        matStepperNext
+        [disabled]="firstFormGroup.status == 'INVALID'">
+        Weiter
+      </button>
+    </div>
+  </mat-step>  <mat-step [stepControl]="firstFormGroup" class="firstStep">
+    <form [formGroup]="firstFormGroup" class="flexContainerRow width50">
+      <ng-template matStepLabel>Persönliche Informationen</ng-template>
+      <div class="leftContainer">
+        <mat-form-field appearance="fill">
+          <mat-label>Name</mat-label>
+          <input
+            matInput
+            formControlName="firstName"
+            placeholder="First name"
+            required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Nachname</mat-label>-->
-<!--          <input-->
-<!--            matInput-->
-<!--            formControlName="lastName"-->
-<!--            placeholder="Last name"-->
-<!--            required />-->
-<!--        </mat-form-field>-->
+        <mat-form-field appearance="fill">
+          <mat-label>Nachname</mat-label>
+          <input
+            matInput
+            formControlName="lastName"
+            placeholder="Last name"
+            required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Geburtstag</mat-label>-->
-<!--          <input-->
-<!--            matInput-->
-<!--            [matDatepicker]="birthdatePicker"-->
-<!--            formControlName="birthdate"-->
-<!--            required />-->
-<!--          <mat-hint>MM.DD.YYYY</mat-hint>-->
-<!--          <mat-datepicker-toggle-->
-<!--            matSuffix-->
-<!--            [for]="birthdatePicker"></mat-datepicker-toggle>-->
-<!--          <mat-datepicker-->
-<!--            #birthdatePicker-->
-<!--            startView="multi-year"></mat-datepicker>-->
-<!--        </mat-form-field>-->
+        <mat-form-field appearance="fill">
+          <mat-label>Geburtstag</mat-label>
+          <input
+            matInput
+            [matDatepicker]="birthdatePicker"
+            formControlName="birthdate"
+            required />
+          <mat-hint>MM.DD.YYYY</mat-hint>
+          <mat-datepicker-toggle
+            matSuffix
+            [for]="birthdatePicker"></mat-datepicker-toggle>
+          <mat-datepicker
+            #birthdatePicker
+            startView="multi-year"></mat-datepicker>
+        </mat-form-field>
 
-<!--        <mat-form-field>-->
-<!--          <mat-label>Geschlecht</mat-label>-->
-<!--          <mat-select>-->
-<!--            <mat-option value="male">männlich</mat-option>-->
-<!--            <mat-option value="female">weiblich</mat-option>-->
-<!--            <mat-option value="divers">divers</mat-option>-->
-<!--          </mat-select>-->
-<!--        </mat-form-field>-->
-<!--      </div>-->
-<!--      <div class="rightContainer">-->
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Adresse</mat-label>-->
-<!--          <input matInput formControlName="address" required />-->
-<!--        </mat-form-field>-->
+        <mat-form-field>
+          <mat-label>Geschlecht</mat-label>
+          <mat-select>
+            <mat-option value="male">männlich</mat-option>
+            <mat-option value="female">weiblich</mat-option>
+            <mat-option value="divers">divers</mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="rightContainer">
+        <mat-form-field appearance="fill">
+          <mat-label>Adresse</mat-label>
+          <input matInput formControlName="address" required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Postleitzahl</mat-label>-->
-<!--          <input matInput formControlName="postalCode" required />-->
-<!--        </mat-form-field>-->
+        <mat-form-field appearance="fill">
+          <mat-label>Postleitzahl</mat-label>
+          <input matInput formControlName="postalCode" required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>Telefon</mat-label>-->
-<!--          <input matInput formControlName="phone" required />-->
-<!--        </mat-form-field>-->
+        <mat-form-field appearance="fill">
+          <mat-label>Telefon</mat-label>
+          <input matInput formControlName="phone" required />
+        </mat-form-field>
 
-<!--        <mat-form-field appearance="fill">-->
-<!--          <mat-label>E-Mail</mat-label>-->
-<!--          <input matInput formControlName="email" required />-->
-<!--          <mat-error>Ungültige E-Mail Adresse</mat-error>-->
-<!--        </mat-form-field>-->
-<!--      </div>-->
-<!--    </form>-->
-<!--    <div class="buttonsContainer">-->
-<!--      <button mat-button matStepperPrevious class="backButton">Zurück</button>-->
-<!--      <button-->
-<!--        mat-button-->
-<!--        matStepperNext-->
-<!--        [disabled]="firstFormGroup.status == 'INVALID'">-->
-<!--        Weiter-->
-<!--      </button>-->
-<!--    </div>-->
-<!--  </mat-step>-->
+        <mat-form-field appearance="fill">
+          <mat-label>E-Mail</mat-label>
+          <input matInput formControlName="email" required />
+          <mat-error>Ungültige E-Mail Adresse</mat-error>
+        </mat-form-field>
+      </div>
+    </form>
+    <div class="buttonsContainer">
+      <button mat-button matStepperPrevious class="backButton">Zurück</button>
+      <button
+        mat-button
+        matStepperNext
+        [disabled]="firstFormGroup.status == 'INVALID'">
+        Weiter
+      </button>
+    </div>
+  </mat-step>
 
   <!--  Step 2-->
   <mat-step [stepControl]="secondFormGroup">