diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/judicial-office-holders/search-for-judicial-member/search-for-judicial-member.component.html b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/judicial-office-holders/search-for-judicial-member/search-for-judicial-member.component.html
index bd86be25d..68b6db070 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/judicial-office-holders/search-for-judicial-member/search-for-judicial-member.component.html
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/judicial-office-holders/search-for-judicial-member/search-for-judicial-member.component.html
@@ -14,7 +14,7 @@
     <input id="judiciaryDisplayNameInput" class="govuk-input" type="text" formControlName="displayName" tabindex="2" />
   </div>
   <button
-    *ngIf="searchResult && form.valid"
+    *ngIf="judicialMember && form.valid"
     class="govuk-button"
     data-module="govuk-button"
     (click)="confirmJudiciaryMemberWithDisplayName()"
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/judicial-office-holders/search-for-judicial-member/search-for-judicial-member.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/judicial-office-holders/search-for-judicial-member/search-for-judicial-member.component.ts
index 1a184dcb4..97d9a676e 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/judicial-office-holders/search-for-judicial-member/search-for-judicial-member.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/judicial-office-holders/search-for-judicial-member/search-for-judicial-member.component.ts
@@ -34,17 +34,51 @@ export class SearchForJudicialMemberComponent {
     }
     @Output() judicialMemberSelected = new EventEmitter<JudicialMemberDto>();
 
-    private judicialMember: JudicialMemberDto;
+    judicialMember: JudicialMemberDto;
     private editMode = false;
     constructor(private judiciaryService: JudicialService) {
         this.createForm();
     }
 
+    createForm() {
+        this.form = new FormGroup<SearchForJudicialMemberForm>({
+            judiciaryEmail: new FormControl<string>('', [Validators.required, Validators.minLength(3)]),
+            displayName: new FormControl<string>('')
+        });
+
+        this.form.controls.judiciaryEmail.valueChanges
+            .pipe(
+                tap(() => {
+                    this.form.controls.displayName.removeValidators(Validators.required);
+                    this.form.controls.displayName.updateValueAndValidity({ emitEvent: false });
+                }),
+                debounceTime(this.NotificationDelayTime)
+            )
+            .subscribe(newJudiciaryEmail => {
+                if (newJudiciaryEmail === '') {
+                    this.showResult = false;
+                    this.form.reset({
+                        judiciaryEmail: '',
+                        displayName: ''
+                    });
+                }
+
+                if (this.form.controls.judiciaryEmail.invalid) {
+                    return;
+                }
+                if (this.editMode) {
+                    return;
+                }
+                this.searchForJudicialMember();
+            });
+    }
+
     searchForJudicialMember() {
         this.judiciaryService.getJudicialUsers(this.form.value.judiciaryEmail).subscribe(result => {
             this.searchResult = result;
             this.showResult = true;
             this.form.controls.displayName.addValidators(Validators.required);
+            this.form.controls.displayName.updateValueAndValidity({ emitEvent: false });
         });
     }
 
@@ -74,39 +108,6 @@ export class SearchForJudicialMemberComponent {
         });
         this.form.controls.displayName.removeValidators(Validators.required);
     }
-
-    createForm() {
-        this.form = new FormGroup<SearchForJudicialMemberForm>({
-            judiciaryEmail: new FormControl<string>('', [Validators.required, Validators.minLength(3)]),
-            displayName: new FormControl<string>('')
-        });
-
-        this.form.controls.judiciaryEmail.valueChanges
-            .pipe(
-                tap(() => {
-                    this.form.controls.displayName.removeValidators(Validators.required);
-                    this.form.controls.judiciaryEmail.updateValueAndValidity({ emitEvent: false });
-                }),
-                debounceTime(this.NotificationDelayTime)
-            )
-            .subscribe(newJudiciaryEmail => {
-                if (newJudiciaryEmail === '') {
-                    this.showResult = false;
-                    this.form.reset({
-                        judiciaryEmail: '',
-                        displayName: ''
-                    });
-                }
-
-                if (this.form.controls.judiciaryEmail.invalid) {
-                    return;
-                }
-                if (this.editMode) {
-                    return;
-                }
-                this.searchForJudicialMember();
-            });
-    }
 }
 
 interface SearchForJudicialMemberForm {