diff --git a/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/manual-submission-common.component.ts b/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/manual-submission-common.component.ts
index 77bcd3a9a..72d5d64db 100644
--- a/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/manual-submission-common.component.ts
+++ b/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/manual-submission-common.component.ts
@@ -184,12 +184,13 @@ export interface ManualSubmissionBody {
 						</div>
 						<div class="col-xl-3 col-lg-6 col-md-12">
 							<mat-form-field>
-								<mat-label>Sex <span class="optional-label">(optional)</span></mat-label>
+								<mat-label>Sex</mat-label>
 								<mat-select formControlName="genderCode">
 									<mat-option *ngFor="let gdr of genderTypes" [value]="gdr.code">
 										{{ gdr.desc }}
 									</mat-option>
 								</mat-select>
+								<mat-error *ngIf="form.get('genderCode')?.hasError('required')">This is required</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-xl-3 col-lg-6 col-md-12">
@@ -541,7 +542,7 @@ export class ManualSubmissionCommonComponent implements OnInit {
 			emailAddress: new FormControl('', [FormControlValidators.email]),
 			phoneNumber: new FormControl('', [Validators.required]),
 			driversLicense: new FormControl(''),
-			genderCode: new FormControl(''),
+			genderCode: new FormControl('', [Validators.required]),
 			dateOfBirth: new FormControl(null, [Validators.required]),
 			birthPlace: new FormControl('', [FormControlValidators.required]),
 			jobTitle: new FormControl('', [FormControlValidators.required]),
diff --git a/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-personal-information.component.ts b/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-personal-information.component.ts
index bad18643d..c5ff3c3b6 100644
--- a/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-personal-information.component.ts
+++ b/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-personal-information.component.ts
@@ -59,12 +59,13 @@ import { AppInviteOrgData, CrcFormStepComponent } from '../screening-application
 						</div>
 						<div class="col-lg-4 col-md-12 col-sm-12">
 							<mat-form-field>
-								<mat-label>Sex <span class="optional-label">(optional)</span></mat-label>
+								<mat-label>Sex</mat-label>
 								<mat-select formControlName="genderCode">
 									<mat-option *ngFor="let gdr of genderTypes" [value]="gdr.code">
 										{{ gdr.desc }}
 									</mat-option>
 								</mat-select>
+								<mat-error *ngIf="form.get('genderCode')?.hasError('required')">This is required</mat-error>
 							</mat-form-field>
 						</div>
 					</div>
@@ -97,7 +98,7 @@ export class SaPersonalInformationComponent implements CrcFormStepComponent {
 				Validators.required,
 			]),
 			employeeId: new FormControl(data.employeeId),
-			genderCode: new FormControl(data.genderCode),
+			genderCode: new FormControl(data.genderCode, [FormControlValidators.required]),
 		});
 	}
 	get orgData(): AppInviteOrgData | null {
diff --git a/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-security-information.component.ts b/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-security-information.component.ts
index 3dbe552ee..9d4306ff1 100644
--- a/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-security-information.component.ts
+++ b/src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-application-steps/step-components/sa-security-information.component.ts
@@ -68,7 +68,12 @@ import { AppInviteOrgData, CrcFormStepComponent } from '../screening-application
 									<div class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
 										<mat-form-field>
 											<mat-label>{{ companyFacilityLabel }}</mat-label>
-											<input matInput formControlName="contractedCompanyName" />
+											<input
+												matInput
+												formControlName="contractedCompanyName"
+												[errorStateMatcher]="matcher"
+												maxlength="100"
+											/>
 											<mat-hint>{{ companyFacilityHint }}</mat-hint>
 											<mat-error *ngIf="form.get('contractedCompanyName')?.hasError('required')"
 												>This is required</mat-error