diff --git a/src/app/authorize/components/form-authorize/form-authorize.component.html b/src/app/authorize/components/form-authorize/form-authorize.component.html
index 6e6bd48607..f753ae9ae1 100644
--- a/src/app/authorize/components/form-authorize/form-authorize.component.html
+++ b/src/app/authorize/components/form-authorize/form-authorize.component.html
@@ -177,10 +177,11 @@ <h1 class="orc-font-heading-small" i18n="@@authorize.authorize">
       <div class="row" [ngClass]="{ 'center-content': platformInfo.columns4 }">
         <div class="col l2 profile-icon-wrapper">
           <div class="icon">
-            <mat-icon
-              class="profile-icon"
-              aria-hidden="false"
-              ><img src="./assets/vectors/profile-not-verified.svg" alt="profile icon" />
+            <mat-icon class="profile-icon" aria-hidden="false"
+              ><img
+                src="./assets/vectors/profile-not-verified.svg"
+                alt="profile icon"
+              />
             </mat-icon>
           </div>
         </div>
diff --git a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.html b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.html
index ab93f2ac42..edf4e9003c 100644
--- a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.html
+++ b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.html
@@ -7,8 +7,7 @@
       class="orc-font-small-print"
       i18n="@@ngOrcid.signin.2fa.label"
       [ngClass]="{
-        error:
-          verificationFormControl?.touched && verificationFormControl.errors
+        error: verificationWasTouched && isVerificationCodeInvalid
       }"
       *ngIf="!recoveryCode && signInUpdatesV1Togglz"
       >Two-factor authentication code
@@ -32,10 +31,51 @@
         appTrim
         autocomplete="off"
       />
-      <mat-hint align="end"
-        >{{ inputVerificationCode.value?.length || 0 }}/6</mat-hint
+      <ng-container *ngIf="!signInUpdatesV1Togglz">
+        <mat-hint align="end"
+          >{{ inputVerificationCode.value?.length || 0 }}/6</mat-hint
+        >
+        <mat-error *ngIf="verificationFormControl.hasError('required')">
+          <p
+            i18n="@@ngOrcid.signin.2fa.verificationCodeRequired"
+            class="error-message"
+          >
+            Authentication code is required
+          </p>
+          <p class="error-length">
+            {{ inputVerificationCode.value?.length || 0 }}/6
+          </p>
+        </mat-error>
+
+        <mat-error
+          *ngIf="
+            verificationFormControl.hasError('minlength') ||
+            verificationFormControl.hasError('maxlength')
+          "
+        >
+          <p
+            i18n="@@ngOrcid.signin.2fa.badVerificationCodeLength"
+            class="error-message"
+          >
+            Invalid authentication code length
+          </p>
+          <p class="error-length">
+            {{ inputVerificationCode.value?.length || 0 }}/6
+          </p>
+        </mat-error>
+      </ng-container>
+    </mat-form-field>
+    <ng-container *ngIf="signInUpdatesV1Togglz && !recoveryCode">
+      <mat-hint
+        class="orc-font-small-print error-length"
+        *ngIf="!isVerificationCodeInvalid"
+        >{{ verificationFormControl.value?.length || 0 }}/6</mat-hint
+      >
+      <mat-error
+        *ngIf="
+          verificationWasTouched && verificationFormControl.hasError('required')
+        "
       >
-      <mat-error *ngIf="verificationFormControl.hasError('required')">
         <p
           i18n="@@ngOrcid.signin.2fa.verificationCodeRequired"
           class="error-message"
@@ -43,14 +83,15 @@
           Authentication code is required
         </p>
         <p class="error-length">
-          {{ inputVerificationCode.value?.length || 0 }}/6
+          {{ verificationFormControl.value?.length || 0 }}/6
         </p>
       </mat-error>
 
       <mat-error
         *ngIf="
-          verificationFormControl.hasError('minlength') ||
-          verificationFormControl.hasError('maxlength')
+          verificationWasTouched &&
+          (verificationFormControl.hasError('minlength') ||
+            verificationFormControl.hasError('maxlength'))
         "
       >
         <p
@@ -60,17 +101,21 @@
           Invalid authentication code length
         </p>
         <p class="error-length">
-          {{ inputVerificationCode.value?.length || 0 }}/6
+          {{ verificationFormControl.value?.length || 0 }}/6
         </p>
       </mat-error>
-    </mat-form-field>
+    </ng-container>
   </div>
-  <p>
+  <p
+    [ngClass]="{
+      'enter-code': signInUpdatesV1Togglz && isVerificationCodeInvalid
+    }"
+  >
     <a
       [ngClass]="{
         'mat-button-font': !signInUpdatesV1Togglz,
         underline: signInUpdatesV1Togglz,
-        'orcid-orc-font-body-small': signInUpdatesV1Togglz
+        'orc-font-body-small': signInUpdatesV1Togglz
       }"
       (click)="showAuthenticationCode()"
       i18n="@@ngOrcid.signin.2fa.instructionsPart1"
@@ -88,7 +133,7 @@
       [ngClass]="{
         'mat-button-font': !signInUpdatesV1Togglz,
         underline: signInUpdatesV1Togglz,
-        'orcid-orc-font-body-small': signInUpdatesV1Togglz
+        'orc-font-body-small': signInUpdatesV1Togglz
       }"
       (click)="showRecoveryCode()"
       i18n="@@ngOrcid.signin.2fa.noDevice2"
@@ -141,10 +186,51 @@
         appTrim
         autocomplete="off"
       />
-      <mat-hint align="end"
-        >{{ inputRecoveryCode.value?.length || 0 }}/10</mat-hint
+      <ng-container *ngIf="!signInUpdatesV1Togglz">
+        <mat-hint align="end"
+          >{{ inputRecoveryCode.value?.length || 0 }}/10</mat-hint
+        >
+        <mat-error *ngIf="recoveryCodeFormControl.hasError('required')">
+          <p
+            i18n="@@ngOrcid.signin.2fa.recoveryCodeRequired"
+            class="error-message"
+          >
+            Recovery code is required
+          </p>
+          <p class="error-length">
+            {{ inputRecoveryCode.value?.length || 0 }}/10
+          </p>
+        </mat-error>
+
+        <mat-error
+          *ngIf="
+            recoveryCodeFormControl.hasError('minlength') ||
+            recoveryCodeFormControl.hasError('maxlength')
+          "
+        >
+          <p
+            i18n="@@ngOrcid.signin.2fa.badRecoveryCodeLength"
+            class="error-message"
+          >
+            Invalid recovery code length
+          </p>
+          <p class="error-length">
+            {{ inputRecoveryCode.value?.length || 0 }}/10
+          </p>
+        </mat-error>
+      </ng-container>
+    </mat-form-field>
+    <ng-container *ngIf="signInUpdatesV1Togglz && recoveryCode">
+      <mat-hint
+        class="orc-font-small-print error-message"
+        *ngIf="!isRecoveryCodeInvalid"
+        >{{ recoveryCodeFormControl.value?.length || 0 }}/10</mat-hint
+      >
+      <mat-error
+        *ngIf="
+          recoveryCodeWasTouched && recoveryCodeFormControl.hasError('required')
+        "
       >
-      <mat-error *ngIf="recoveryCodeFormControl.hasError('required')">
         <p
           i18n="@@ngOrcid.signin.2fa.recoveryCodeRequired"
           class="error-message"
@@ -152,14 +238,15 @@
           Recovery code is required
         </p>
         <p class="error-length">
-          {{ inputRecoveryCode.value?.length || 0 }}/10
+          {{ recoveryCodeFormControl.value?.length || 0 }}/10
         </p>
       </mat-error>
 
       <mat-error
         *ngIf="
-          recoveryCodeFormControl.hasError('minlength') ||
-          recoveryCodeFormControl.hasError('maxlength')
+          recoveryCodeWasTouched &&
+          (recoveryCodeFormControl.hasError('minlength') ||
+            recoveryCodeFormControl.hasError('maxlength'))
         "
       >
         <p
@@ -169,10 +256,10 @@
           Invalid recovery code length
         </p>
         <p class="error-length">
-          {{ inputRecoveryCode.value?.length || 0 }}/10
+          {{ recoveryCodeFormControl.value?.length || 0 }}/10
         </p>
       </mat-error>
-    </mat-form-field>
+    </ng-container>
   </div>
 
   <button
diff --git a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.scss b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.scss
index c9b74ad4e1..9e9c321fc6 100644
--- a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.scss
+++ b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.scss
@@ -81,6 +81,10 @@
   }
 }
 
+p.enter-code {
+  margin-top: 28px;
+}
+
 mat-label.orc-font-small-print {
   font-weight: bold;
   display: block;
diff --git a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.scss-theme.scss b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.scss-theme.scss
index c2cb366e91..d50c78394b 100644
--- a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.scss-theme.scss
+++ b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.scss-theme.scss
@@ -10,6 +10,10 @@
     color: $orcid-light-primary-text;
     background: mat.get-color-from-palette($primary, 700);
   }
+
+  .error {
+    color: map-get($foreground, 'state-warning-dark');
+  }
 }
 
 @include two-factor-authentication-form-theme($orcid-app-theme);
diff --git a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.ts b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.ts
index bdcdc952fc..0c4fc22f25 100644
--- a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.ts
+++ b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.ts
@@ -41,23 +41,57 @@ export class TwoFactorAuthenticationFormComponent implements AfterViewInit {
 
   recoveryCode = false
 
-  verificationFormControl = new UntypedFormControl('', [
-    Validators.required,
-    Validators.minLength(6),
-    Validators.maxLength(6),
-  ])
-
-  recoveryCodeFormControl = new UntypedFormControl('', [
-    Validators.required,
-    Validators.maxLength(10),
-    Validators.minLength(10),
-  ])
-
   twoFactorForm = new UntypedFormGroup({
-    verificationCode: this.verificationFormControl,
-    recoveryCode: this.recoveryCodeFormControl,
+    verificationCode: new UntypedFormControl('', [
+      Validators.required,
+      Validators.minLength(6),
+      Validators.maxLength(6),
+    ]),
+    recoveryCode: new UntypedFormControl('', [
+      Validators.required,
+      Validators.maxLength(10),
+      Validators.minLength(10),
+    ]),
   })
 
+  get verificationFormControl() {
+    return this.twoFactorForm.controls.verificationCode
+  }
+
+  get recoveryCodeFormControl() {
+    return this.twoFactorForm.controls.recoveryCode
+  }
+
+  get verificationWasTouched() {
+    return (
+      this.verificationFormControl.dirty || this.verificationFormControl.touched
+    )
+  }
+
+  get recoveryCodeWasTouched() {
+    return (
+      this.recoveryCodeFormControl.dirty || this.recoveryCodeFormControl.touched
+    )
+  }
+
+  get isVerificationCodeInvalid() {
+    return (
+      (this.verificationWasTouched &&
+        this.verificationFormControl.hasError('required')) ||
+      this.verificationFormControl.hasError('minlength') ||
+      this.verificationFormControl.hasError('maxlength')
+    )
+  }
+
+  get isRecoveryCodeInvalid() {
+    return (
+      (this.recoveryCodeWasTouched &&
+        this.verificationFormControl.hasError('required')) ||
+      this.verificationFormControl.hasError('minlength') ||
+      this.verificationFormControl.hasError('maxlength')
+    )
+  }
+
   constructor(
     private cdref: ChangeDetectorRef,
     @Inject(WINDOW) private window: Window
diff --git a/src/app/sign-in/components/form-sign-in/form-sign-in.component.html b/src/app/sign-in/components/form-sign-in/form-sign-in.component.html
index ffb043a98c..520fddf023 100644
--- a/src/app/sign-in/components/form-sign-in/form-sign-in.component.html
+++ b/src/app/sign-in/components/form-sign-in/form-sign-in.component.html
@@ -62,8 +62,7 @@
   <ng-container *ngIf="signInUpdatesV1Togglz">
     <app-my-orcid-alerts
       *ngIf="
-        (emailVerified || invalidVerifyUrl) ||
-        (printError && badCredentials)
+        emailVerified || invalidVerifyUrl || (printError && badCredentials)
       "
       [emailVerified]="emailVerified"
       [invalidVerifyUrl]="invalidVerifyUrl"
@@ -114,7 +113,9 @@
       </mat-error>
 
       <app-print-errors
-        *ngIf="signInUpdatesV1Togglz && printError && !badCredentials"
+        *ngIf="
+          signInUpdatesV1Togglz && printError && !badCredentials && !show2FA
+        "
         [showDeprecatedError]="showDeprecatedError"
         [showUnclaimedError]="showUnclaimedError"
         [showDeactivatedError]="showDeactivatedError"
diff --git a/src/app/sign-in/components/social/social.component.html b/src/app/sign-in/components/social/social.component.html
index cc488374ef..6753d4a648 100644
--- a/src/app/sign-in/components/social/social.component.html
+++ b/src/app/sign-in/components/social/social.component.html
@@ -14,7 +14,7 @@
   <img
     [src]="
       signInUpdatesV1Togglz
-        ? './assets/vectors/institutional-access.svg'
+        ? './assets/vectors/institutional-access-no-background.svg'
         : './assets/vectors/institutional-access.svg'
     "
     alt="Institutional"
diff --git a/src/assets/vectors/institutional-access-no-background.svg b/src/assets/vectors/institutional-access-no-background.svg
new file mode 100644
index 0000000000..261bea3b9f
--- /dev/null
+++ b/src/assets/vectors/institutional-access-no-background.svg
@@ -0,0 +1,11 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_85_578)">
+<path d="M3.20385 8.86558H20.7838C21.3454 8.86558 21.835 8.51398 22.0102 7.98598C22.1494 7.45798 21.9742 6.89638 21.5182 6.57958L12.7294 0.249578C12.2734 -0.0660216 11.6794 -0.0660216 11.2594 0.249578L2.46945 6.57838C2.15505 6.82438 1.94385 7.17598 1.94385 7.59838C1.94385 8.30278 2.50425 8.86558 3.20385 8.86558ZM11.995 2.85118L16.8622 6.33238H7.12785L11.9962 2.85238L11.995 2.85118ZM10.273 17.5212L10.3126 11.8344L7.40145 10.4244V18.93L10.273 17.5212ZM16.6414 18.8904V10.506L13.7698 11.9148V17.6004L16.6414 18.8904Z" fill="#212121"/>
+<path d="M23.3182 21.5724H22.2574V20.5116C22.2574 20.1456 21.961 19.848 21.5962 19.848H20.6026V11.3328C20.6026 10.524 19.9426 9.86157 19.1374 9.86157C18.3298 9.86157 17.671 10.524 17.671 11.3328V19.848L6.31896 19.8456V11.3328C6.31896 10.524 5.65896 9.86157 4.85256 9.86157C4.04616 9.86157 3.38736 10.524 3.38736 11.3328V19.8444H2.39616C2.03136 19.8444 1.73496 20.142 1.73496 20.5092V21.5688H0.67416C0.30936 21.5688 0.0141602 21.8664 0.0141602 22.2336V23.3856H23.9758V22.2384C23.977 21.8712 23.683 21.5736 23.3182 21.5724Z" fill="#212121"/>
+</g>
+<defs>
+<clipPath id="clip0_85_578">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>