diff --git a/core/css/guest.css b/core/css/guest.css
index 8c513d63b31a1cb7ec12f2773318dfdce812bd24..68d980ec76927060f9b29a09bfd72f14f1295e40 100755
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -1734,7 +1734,7 @@ a.legal {
 #body-login .guest-box.login-box .input-field__input {
     color: var(--color-main-text);
 }
-#body-login .guest-box.login-box .login-additional.login-passwordless .input-field__input {
+#body-login .guest-box.login-box .login-additional.login-box__wrapper .input-field__input {
     padding: 12px 16px;
     width: 100%;
     height: 48px;
@@ -1745,7 +1745,7 @@ a.legal {
     background-color: var(--color-main-background);
     color: var(--color-main-text);
 }
-#body-login .guest-box.login-box .login-additional.login-passwordless .button-vue.button-vue--size-normal.button-vue--text-only.button-vue--vue-tertiary.button-vue--wide {
+#body-login .guest-box.login-box .login-additional.login-box__wrapper .button-vue.button-vue--size-normal.button-vue--text-only.button-vue--vue-tertiary.button-vue--wide {
     color: #808080;
 }
 #body-login .guest-box.login-box h2{
diff --git a/core/js/custom-login.js b/core/js/custom-login.js
index 6410cc961d07d1745357b010c52633446386ad73..9cec44f959515ec19843d9c7d1f3af9fcae6cbb1 100644
--- a/core/js/custom-login.js
+++ b/core/js/custom-login.js
@@ -40,8 +40,8 @@ document.addEventListener('DOMContentLoaded', function() {
 	}
 	if (window.location.href.includes("?showLoginWithDevice=1")) {
 		var lostPasswordLink = document.getElementById("lost-password");
-		if (lostPasswordLink && lostPasswordLink.nextElementSibling) {
-			var loginWithDeviceLink = lostPasswordLink.nextElementSibling;
+		if (lostPasswordLink && lostPasswordLink.previousElementSibling) {
+			var loginWithDeviceLink = lostPasswordLink.previousElementSibling;
 			loginWithDeviceLink.click();
 		}
 	}