diff --git a/packages/web/src/js/Toast.ts b/packages/web/src/js/Toast.ts
index 714937de86..f4cbcd2503 100644
--- a/packages/web/src/js/Toast.ts
+++ b/packages/web/src/js/Toast.ts
@@ -195,7 +195,7 @@ class Toast extends BaseComponent {
     if (linkContent) {
       const linkElementWithType = document.createElement(linkProps.elementType || 'a');
       linkElement.replaceWith(linkElementWithType);
-      const isUnderlined = linkProps.isUnderlined !== undefined ? linkProps.isUnderlined : true;
+      const isUnderlined = linkProps.isUnderlined != null ? linkProps.isUnderlined : true;
 
       linkElementWithType.classList.add('ToastBar__link');
       if (isUnderlined) {
diff --git a/packages/web/src/scss/components/TextField/_TextField.scss b/packages/web/src/scss/components/TextField/_TextField.scss
index 8c2c3e6f19..07b4683743 100644
--- a/packages/web/src/scss/components/TextField/_TextField.scss
+++ b/packages/web/src/scss/components/TextField/_TextField.scss
@@ -115,6 +115,11 @@ $_field-name: 'TextField';
 }
 
 // 6.
+.TextField__passwordToggle > .TextField__input:focus-visible,
+.TextField__passwordToggle__button:focus-visible {
+    outline: 0;
+}
+
 .TextField__input:hover + .TextField__passwordToggle__button {
     background-color: form-fields-theme.$input-background-color-hover;
 }
@@ -146,11 +151,6 @@ $_field-name: 'TextField';
 }
 // stylelint-enable selector-max-specificity, selector-max-class, selector-max-compound-selectors
 
-.TextField__passwordToggle > .TextField__input:focus-visible,
-.TextField__passwordToggle__button:focus-visible {
-    outline: 0;
-}
-
 // 9.
 .TextField__passwordToggle__button:focus-visible::after {
     content: '';