diff --git a/docs/_docs/components/forms2.md b/docs/_docs/components/forms2.md
index c3e4fc3..e08746a 100644
--- a/docs/_docs/components/forms2.md
+++ b/docs/_docs/components/forms2.md
@@ -29,7 +29,7 @@ file: components/FormElements/
 
   <div class="FormGroup FormGroup--floatingLabel has-error">
     <input type="email" class="Input" id="errorInput" />
-    <label class="Label" for="errorInput">Enter your name</label>
+    <label class="Label" for="errorInput">Enter your email</label>
     <p class="FormGroup-feedback">This is a required field</p>
   </div>
 
diff --git a/src/mixins/_forms.scss b/src/mixins/_forms.scss
index 7c44455..919a6ae 100644
--- a/src/mixins/_forms.scss
+++ b/src/mixins/_forms.scss
@@ -39,8 +39,8 @@
   }
 
   &:focus {
-    border: $form-field-border-focus;
-    box-shadow: $form-field-box-shadow-focus;
+    border: $form-field-border-focus !important;
+    box-shadow: $form-field-box-shadow-focus !important;
   }
 
   &::placeholder {
@@ -69,8 +69,8 @@
     display: none;
   }
 
-  &:invalid {
-    box-shadow: none;
+  &:not(output) {
+    box-shadow: inherit;
   }
 }