diff --git a/frontend/src/app/Types/types.ts b/frontend/src/app/Types/types.ts
index a6f41f8b2704d2920d4c29671e55e860da42a814..fbd63e175324a9e529933607ff2c7783e03132ec 100644
--- a/frontend/src/app/Types/types.ts
+++ b/frontend/src/app/Types/types.ts
@@ -2,7 +2,7 @@ export type User = {
     id: number;
     username: string;
     password: string;
-    type: string;
+    admin: boolean;
 };
 
 export type QandA = {
diff --git a/frontend/src/app/admin/admin.component.html b/frontend/src/app/admin/admin.component.html
index 10f953898fb6dacc3ced2bc8983abf3fcb5b40aa..be65ba494c87668ee8dac1c67a07f67d3585bc09 100644
--- a/frontend/src/app/admin/admin.component.html
+++ b/frontend/src/app/admin/admin.component.html
@@ -3,12 +3,12 @@
 <table>
     <thead>
         <th>Username</th>
-        <th>Type</th>
+        <th>Admin</th>
     </thead>
     <tbody>
         <tr *ngFor="let user of users">
             <td>{{user.username}}</td>
-            <td>{{user.type}}</td>
+            <td>{{user.admin}}</td>
             <td><button (click)="showUpdateModal(user)">UPDATE</button></td>
             <td><button (click)="deleteUser(user)">DELETE</button></td>
         </tr>
diff --git a/frontend/src/app/admin/admin.component.ts b/frontend/src/app/admin/admin.component.ts
index a46e7de366c5ccacc68566d52d378991dbf46489..fda032247be10133499fa9d066a4658a98b544d3 100644
--- a/frontend/src/app/admin/admin.component.ts
+++ b/frontend/src/app/admin/admin.component.ts
@@ -53,6 +53,7 @@ export class AdminComponent implements OnInit {
     }
 
     showUpdateModal(user: User){
+      this.modalUpdate = false;
       this.userToEdit = user;
       this.modalUpdate = true;
     }
diff --git a/frontend/src/app/create-user/create-user.component.html b/frontend/src/app/create-user/create-user.component.html
index e8af8eaa79e1a0c05c6379c8456fda7379dc1581..90b37216e740e6b5c80f9a7c5227986ee1afe438 100644
--- a/frontend/src/app/create-user/create-user.component.html
+++ b/frontend/src/app/create-user/create-user.component.html
@@ -4,7 +4,7 @@
     <br>
     <input type="password" placeholder="Password" formControlName="password">
     <br>
-    <input type="type" placeholder="player" formControlName="type">
+    <label>Admin</label><input type="checkbox" formControlName="admin">
     <br>
     <button type="submit">Create</button><button (click)="closeModal.emit()">Close</button>
 </form>
\ No newline at end of file
diff --git a/frontend/src/app/create-user/create-user.component.ts b/frontend/src/app/create-user/create-user.component.ts
index 2c197a5c3e6b5c3c171a066975e1e5e98f00420a..0433a874d02a373fb2cf4b3f470f0e14a60e5f2c 100644
--- a/frontend/src/app/create-user/create-user.component.ts
+++ b/frontend/src/app/create-user/create-user.component.ts
@@ -19,20 +19,20 @@ export class CreateUserComponent {
     this.createUser = new FormGroup({
       username: new FormControl('', Validators.required),
       password: new FormControl('', Validators.required),
-      type: new FormControl('player', Validators.required)
+      admin: new FormControl(false, Validators.required)
     });
   }
 
   onSubmit() {
     const username = this.createUser.get("username")!.value;
     const password = this.createUser.get("password")!.value;
-    const type = this.createUser.get("type")!.value;
+    const type = this.createUser.get("admin")!.value;
 
     const user: User = {
       id: undefined,
       username : username,
       password: password,
-      type: type
+      admin: type
     }
 
     this.userController.addUserAdmin(user);
diff --git a/frontend/src/app/services/authentication.service.ts b/frontend/src/app/services/authentication.service.ts
index 942f8b6b641464ccaa19138039a91bfcc9eae5d0..ab540bc734ddc49b4f690227c5533b03ca9928e2 100644
--- a/frontend/src/app/services/authentication.service.ts
+++ b/frontend/src/app/services/authentication.service.ts
@@ -59,7 +59,7 @@ export class AuthenticationService {
     
     if (user === null)
       return false;
-    return user.type === 'admin';
+    return user.admin;
   }
 
   getUsername(): string {
diff --git a/frontend/src/app/signup/signup.component.ts b/frontend/src/app/signup/signup.component.ts
index 1cf943a09aae8f76176843feeec403c089128735..79274242f7cfd5950c55f077429240ff2045d702 100644
--- a/frontend/src/app/signup/signup.component.ts
+++ b/frontend/src/app/signup/signup.component.ts
@@ -30,7 +30,7 @@ export class SignupComponent {
   onSubmit(): void {
     const user: User = {
       id: undefined,
-      type: undefined,
+      admin: undefined,
       username: this.signupForm.get('username')!.value,
       password: this.signupForm.get('password')!.value
     }
diff --git a/frontend/src/app/update-user/update-user.component.html b/frontend/src/app/update-user/update-user.component.html
index 6f8cae1c4b0e758fdcd4d68b8bc5d5e405c04382..2db8b7681dba1c75ad19fa09dbb77625b2daac49 100644
--- a/frontend/src/app/update-user/update-user.component.html
+++ b/frontend/src/app/update-user/update-user.component.html
@@ -2,7 +2,7 @@
 <form [formGroup]="updateUser" (ngSubmit)="onSubmit()">
     <input type="text" formControlName="username">
     <br>
-    <input type="text" formControlName="type">
+    <label>Admin</label><input type="checkbox" formControlName="admin">
     <br>
     <button type="submit">Update</button><button (click)="closeModal.emit();">Close</button>
 </form>
\ No newline at end of file
diff --git a/frontend/src/app/update-user/update-user.component.ts b/frontend/src/app/update-user/update-user.component.ts
index f1fa46d3da3a8a62a9dbb459e1794713acf6aa20..0409efe635464242b081ef43db8a7670b4b4bb26 100644
--- a/frontend/src/app/update-user/update-user.component.ts
+++ b/frontend/src/app/update-user/update-user.component.ts
@@ -20,19 +20,20 @@ export class UpdateUserComponent implements OnInit {
   ngOnInit(): void {
     this.updateUser = new FormGroup({
       username: new FormControl(this.user.username, Validators.required),
-      type: new FormControl(this.user.type, Validators.required)
+      admin: new FormControl(this.user.admin, Validators.required)
     });
   }
 
   onSubmit() {
     const username = this.updateUser.get("username")!.value;
-    const type = this.updateUser.get("type")!.value;
+    
+    const type = this.updateUser.get("admin")!.value;
 
     const userToEdit: User = {
       id: this.user.id,
       username : username,
       password: undefined,
-      type: type
+      admin: type
     }
 
     this.userController.updateUser(userToEdit);