diff --git a/support-portal-frontend/src/app/component/user/user.component.html b/support-portal-frontend/src/app/component/user/user.component.html
index 4758083..d7c2e9c 100644
--- a/support-portal-frontend/src/app/component/user/user.component.html
+++ b/support-portal-frontend/src/app/component/user/user.component.html
@@ -186,7 +186,7 @@
           </div>
           <div class="modal-body">
             <div>
-              <form>
+              <form #newUserForm="ngForm" (ngSubmit)="onAddNewUser(newUserForm)" >
                 <div class="form-group">
                   <label for="firstName">First Name</label>
                   <input type="text" name="firstName" required ngModel class="form-control">
@@ -222,8 +222,8 @@
                            (change)="onProfileImageChange($any($event).target.files)"
                            class="custom-file-input">
                     <label class="custom-file-label">
-                      <span [hidden]="true"> fileName </span>
-                      <span [hidden]="false">Choose File</span>
+                      <span [hidden]="!profileImageFileName">{{profileImageFileName}}</span>
+                      <span [hidden]="profileImageFileName">Choose File</span>
                     </label>
                   </div>
                 </div>
@@ -247,7 +247,7 @@
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="new-user-close">Close</button>
-            <button type="button" class="btn btn-primary" (click)="saveNewUser()">Save changes</button>
+            <button type="button" class="btn btn-primary" (click)="saveNewUser()" [disabled]="newUserForm.invalid">Save changes</button>
           </div>
         </div>
       </div>
diff --git a/support-portal-frontend/src/app/component/user/user.component.ts b/support-portal-frontend/src/app/component/user/user.component.ts
index 4646de5..a8974f4 100644
--- a/support-portal-frontend/src/app/component/user/user.component.ts
+++ b/support-portal-frontend/src/app/component/user/user.component.ts
@@ -64,7 +64,7 @@ export class UserComponent implements OnInit, OnDestroy {
 
   public onSelectUser(selectedUser: User): void {
     this.selectedUser = selectedUser;
-    document.getElementById('openUserInfo')?.click();
+    this.clickButton('openUserInfo');
   }
 
   public onProfileImageChange(fileList: FileList): void {
@@ -82,7 +82,7 @@ export class UserComponent implements OnInit, OnDestroy {
     let subscription = this.userService.addUser(formData)
       .subscribe(
         (user: User) => {
-          document.getElementById('new-user-close')?.click();
+          this.clickButton('new-user-close');
           this.getUsers(false);
           this.invalidateVariables();
           userForm.reset();
@@ -101,6 +101,10 @@ export class UserComponent implements OnInit, OnDestroy {
   }
 
   public saveNewUser(): void {
-    document.getElementById('new-user-save')?.click();
+    this.clickButton('new-user-save');
+  }
+
+  private clickButton(buttonId: string): void {
+    document.getElementById(buttonId)?.click();
   }
 }