diff --git a/core/css/guest.css b/core/css/guest.css
index 19dce78b4c9c7fd197977af86ca01cc4e6063875..de2d778ea4532276720aada58ec338f569bd18a5 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -1313,8 +1313,17 @@ a.legal {
 
 #body-login #submit-form:hover,
 #body-login #reset-password-submit:hover,
-#body-login .two-factor-submit:hover {
+#body-login .two-factor-submit:hover,
+#body-login #submit-form:active,
+#body-login #reset-password-submit:active,
+#body-login .two-factor-submit:active,
+#body-login #submit-form:focus,
+#body-login #reset-password-submit:focus,
+#body-login .two-factor-submit:focus  {
     opacity: 0.9;
+    border: none !important;
+    outline:none !important;
+    box-shadow: none !important;
 }
 .banner-right-align {
     text-align: left;
diff --git a/core/js/core-login.js b/core/js/custom-login.js
similarity index 100%
rename from core/js/core-login.js
rename to core/js/custom-login.js