diff --git a/Views/Login/ForgotPassword.cshtml b/Views/Login/ForgotPassword.cshtml
index aa73ae4..611af7d 100644
--- a/Views/Login/ForgotPassword.cshtml
+++ b/Views/Login/ForgotPassword.cshtml
@@ -16,7 +16,7 @@
             <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="form-group">
                 <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
-                <input type="text" id="inputUserName" class="form-control">
+                <input type="text" onkeyup="callBackOnEnter(event, requestPasswordReset)" id="inputUserName" class="form-control">
             </div>
             <div class="d-grid">
                 <button type="button" class="btn btn-warning mt-2" onclick="requestPasswordReset()"><i class="bi bi-box-arrow-in-right me-2"></i>@translator.Translate(userLanguage, "Request")</button>
diff --git a/Views/Login/Index.cshtml b/Views/Login/Index.cshtml
index 0ae0483..c9ba39d 100644
--- a/Views/Login/Index.cshtml
+++ b/Views/Login/Index.cshtml
@@ -24,7 +24,7 @@
             <div class="form-group">
                 <label for="inputUserPassword">@translator.Translate(userLanguage, "Password")</label> 
                 <div class="input-group">
-                    <input type="password" id="inputUserPassword" onkeyup="handlePasswordKeyPress(event)" class="form-control">
+                    <input type="password" id="inputUserPassword" onkeyup="callBackOnEnter(event, performLogin)" class="form-control">
                     <div class="input-group-text">
                         <button type="button" class="btn btn-sm text-secondary password-visible-button" onclick="togglePasswordVisibility(this)"><i class="bi bi-eye"></i></button>
                     </div>
diff --git a/Views/Login/OpenIDRegistration.cshtml b/Views/Login/OpenIDRegistration.cshtml
index 17dd7b6..710fad7 100644
--- a/Views/Login/OpenIDRegistration.cshtml
+++ b/Views/Login/OpenIDRegistration.cshtml
@@ -34,7 +34,7 @@
             </div>
             <div class="form-group">
                 <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
-                <input type="text" id="inputUserName" class="form-control" value="@Model">
+                <input type="text" id="inputUserName" class="form-control" value="@Model" onkeyup="callBackOnEnter(event, performOpenIdRegistration)">
             </div>
             <div class="d-grid">
                 <button type="button" class="btn btn-warning mt-2" onclick="performOpenIdRegistration()"><i class="bi bi-box-arrow-in-right me-2"></i>@translator.Translate(userLanguage, "Register")</button>
diff --git a/Views/Login/Registration.cshtml b/Views/Login/Registration.cshtml
index 14a0055..4d3d7f3 100644
--- a/Views/Login/Registration.cshtml
+++ b/Views/Login/Registration.cshtml
@@ -39,7 +39,7 @@
             <div class="form-group">
                 <label for="inputUserPassword">@translator.Translate(userLanguage, "Password")</label>
                 <div class="input-group">
-                    <input type="password" id="inputUserPassword" class="form-control">
+                    <input type="password" id="inputUserPassword" class="form-control" onkeyup="callBackOnEnter(event, performRegistration)">
                     <div class="input-group-text">
                         <button type="button" class="btn btn-sm text-secondary password-visible-button" onclick="togglePasswordVisibility(this)"><i class="bi bi-eye"></i></button>
                     </div>
diff --git a/Views/Login/ResetPassword.cshtml b/Views/Login/ResetPassword.cshtml
index a07b7b4..4480df3 100644
--- a/Views/Login/ResetPassword.cshtml
+++ b/Views/Login/ResetPassword.cshtml
@@ -25,7 +25,7 @@
             <div class="form-group">
                 <label for="inputUserPassword">@translator.Translate(userLanguage, "New Password")</label>
                 <div class="input-group">
-                    <input type="password" id="inputUserPassword" class="form-control">
+                    <input type="password" id="inputUserPassword" class="form-control" onkeyup="callBackOnEnter(event, performPasswordReset)">
                     <div class="input-group-text">
                         <button type="button" class="btn btn-sm text-secondary password-visible-button" onclick="togglePasswordVisibility(this)"><i class="bi bi-eye"></i></button>
                     </div>
diff --git a/wwwroot/js/login.js b/wwwroot/js/login.js
index d7c8dd6..aa0c534 100644
--- a/wwwroot/js/login.js
+++ b/wwwroot/js/login.js
@@ -55,12 +55,6 @@ function performPasswordReset() {
     });
 }
 
-function handlePasswordKeyPress(event) {
-    if (event.keyCode == 13) {
-        performLogin();
-    }
-}
-
 function remoteLogin() {
     $.get('/Login/GetRemoteLoginLink', function (data) {
         if (data) {
diff --git a/wwwroot/js/shared.js b/wwwroot/js/shared.js
index b6cb569..767159f 100644
--- a/wwwroot/js/shared.js
+++ b/wwwroot/js/shared.js
@@ -1535,4 +1535,10 @@ function handleTableColumnDragEnd(tabName) {
     if (isDragging) {
         isDragging = false;
     }
+}
+
+function callBackOnEnter(event, callBack) {
+    if (event.keyCode == 13) {
+        callBack();
+    }
 }
\ No newline at end of file