diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss
index e00d015430..0a1366b7f8 100644
--- a/app/assets/stylesheets/users.scss
+++ b/app/assets/stylesheets/users.scss
@@ -134,6 +134,9 @@
   margin-top: 20px;
   padding: 8px 25px;
 }
+.users-login-primary-button:disabled{
+  cursor: not-allowed;
+}
 .password-length {
   display: flex;
   flex-direction: row;
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
index de98138bda..8c5fce9bf9 100644
--- a/app/views/users/sessions/new.html.erb
+++ b/app/views/users/sessions/new.html.erb
@@ -49,7 +49,7 @@
             <% if Flipper.enabled?(:recaptcha) %>
               <%= recaptcha_tags %>
             <% end %>
-            <%= f.submit t("login"), class: "btn primary-button users-login-primary-button" %>
+            <%= f.submit t("login"), class: "btn primary-button users-login-primary-button", disabled: true %>
             <div class="users-text-container">
               <span class="users-text"><%= t("users.ask_new_user") %></span>
               <% unless Flipper.enabled?(:block_registration) %>
@@ -65,6 +65,23 @@
   </div>
 </div>
 <script>
+    $(document).ready(()=>{
+      let email_input = $(".user-email-input");
+      let password_input = $(".users-password-input");
+      let login_button = $(".users-login-primary-button");
+
+      toggledButton = () =>{
+        let email_input_value = email_input.val().trim();
+        let password_input_value = password_input.val().trim();
+
+        if((email_input_value !== "") && (password_input_value !== "")){
+          login_button.prop("disabled",false);
+        }
+
+      }
+      email_input.on("input",toggledButton);
+      password_input.on("input",toggledButton);
+    })
     $(".users-forgot-password-text").on('click', () => {
       localStorage.setItem('Email', $(".user-email-input").val());
     });