diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
index 90686b7df..4b6b4dd94 100644
--- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
@@ -38,7 +38,7 @@
 
           <div class="form-controls">
             <a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T('Cancel & Go Back') %></a>
-            <button type="submit" class="btn btn--success align-right"><%- @T('Create') %></button>
+            <button type="submit" class="btn btn--success js-submit align-right"><%- @T('Create') %></button>
           </div>
         </form>
       </div>
diff --git a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
index f88259c99..f031066ef 100644
--- a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
+++ b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
@@ -18,8 +18,8 @@
 
 
           <div class="form-controls">
-            <a class="btn btn--text btn--subtle cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
-            <button type="submit" class="btn btn--success submit align-right"><%- @T( 'Create' ) %></button>
+            <a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
+            <button type="submit" class="btn btn--success js-submit align-right"><%- @T( 'Create' ) %></button>
           </div>
         </form>
 
diff --git a/app/assets/javascripts/app/views/password/reset.jst.eco b/app/assets/javascripts/app/views/password/reset.jst.eco
index abe4cb693..1fd5fc24a 100644
--- a/app/assets/javascripts/app/views/password/reset.jst.eco
+++ b/app/assets/javascripts/app/views/password/reset.jst.eco
@@ -10,8 +10,8 @@
         <form class="form-password">
           <div class="form-password-item"></div>
           <div class="form-controls">
-            <a class="btn btn--text btn--subtle cancel" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
-            <button class="btn btn--primary submit align-right"><%- @T( 'Submit' ) %></button>
+            <a class="btn btn--text btn--subtle js-cancel" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
+            <button class="btn btn--primary js-submit align-right"><%- @T( 'Submit' ) %></button>
           </div>
         </form>
       <% end %>
diff --git a/app/assets/javascripts/app/views/password/reset_change.jst.eco b/app/assets/javascripts/app/views/password/reset_change.jst.eco
index a048eff32..edcdc1828 100644
--- a/app/assets/javascripts/app/views/password/reset_change.jst.eco
+++ b/app/assets/javascripts/app/views/password/reset_change.jst.eco
@@ -4,8 +4,8 @@
     <form>
       <div class="form-password-change"></div>
       <div class="form-controls">
-        <a class="btn btn--text btn--subtle cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
-        <button class="btn btn--primary submit align-right"><%- @T( 'Submit' ) %></button>
+        <a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
+        <button class="btn btn--primary js-submit align-right"><%- @T( 'Submit' ) %></button>
       </div>
     </form>
   </div>
diff --git a/app/assets/javascripts/app/views/signup.jst.eco b/app/assets/javascripts/app/views/signup.jst.eco
index 4b5d84ae1..3bdc7e9b6 100644
--- a/app/assets/javascripts/app/views/signup.jst.eco
+++ b/app/assets/javascripts/app/views/signup.jst.eco
@@ -4,8 +4,8 @@
       <h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %></h1>
       <form>
         <div class="form-controls">
-          <a class="btn btn--text btn--subtle" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
-          <button class="btn btn--primary submit align-right"><%- @T( 'Create my account' ) %></button>
+          <a class="btn btn--text btn--subtle js-cancel" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
+          <button class="btn btn--primary js-submit align-right"><%- @T( 'Create my account' ) %></button>
         </div>
       </form>
     </div>
diff --git a/test/browser/agent_ticket_actions_level4_test.rb b/test/browser/agent_ticket_actions_level4_test.rb
index f38a80724..1d74119d2 100644
--- a/test/browser/agent_ticket_actions_level4_test.rb
+++ b/test/browser/agent_ticket_actions_level4_test.rb
@@ -52,7 +52,7 @@ class AgentTicketActionLevel4Test < TestCase
     )
 
     # finally create ticket
-    click( css: '.content.active button.submit' )
+    click( css: '.content.active button.js-submit' )
     sleep 5
 
     location_check(
diff --git a/test/browser/agent_ticket_actions_level6_test.rb b/test/browser/agent_ticket_actions_level6_test.rb
index 4cf3e4db6..48b9b1fc6 100644
--- a/test/browser/agent_ticket_actions_level6_test.rb
+++ b/test/browser/agent_ticket_actions_level6_test.rb
@@ -29,7 +29,7 @@ class AgentTicketActionLevel6Test < TestCase
     sleep 1
 
     # submit form
-    click( css: '.content.active button.submit' )
+    click( css: '.content.active button.js-submit' )
     sleep 2
 
     # check warning
@@ -42,7 +42,7 @@ class AgentTicketActionLevel6Test < TestCase
     @browser.execute_script( "App.TestHelper.attachmentUploadFake('.active .richtext .attachments')" )
 
     # submit form
-    click( css: '.content.active button.submit' )
+    click( css: '.content.active button.js-submit' )
     sleep 5
 
     # no warning
diff --git a/test/browser/customer_ticket_create_test.rb b/test/browser/customer_ticket_create_test.rb
index 45348d21f..f99431b08 100644
--- a/test/browser/customer_ticket_create_test.rb
+++ b/test/browser/customer_ticket_create_test.rb
@@ -28,7 +28,7 @@ class CustomerTicketCreateTest < TestCase
       css: '.newTicket [data-name="body"]',
       value: 'some body 123äöü',
     )
-    click( css: '.newTicket button.submit' )
+    click( css: '.newTicket button.js-submit' )
     sleep 5
 
     # check if ticket is shown
diff --git a/test/browser/signup_password_change_and_reset_test.rb b/test/browser/signup_password_change_and_reset_test.rb
index 4827ac1bb..68d884f33 100644
--- a/test/browser/signup_password_change_and_reset_test.rb
+++ b/test/browser/signup_password_change_and_reset_test.rb
@@ -30,7 +30,7 @@ class SignupPasswordChangeAndResetTest < TestCase
       css: 'input[name="password_confirm"]',
       value: 'some-pass',
     )
-    click( css: 'button.submit' )
+    click( css: 'button.js-submit' )
     sleep 5
 
     exists_not( css: '.signup' )
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index 717062540..52aff170e 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -1070,7 +1070,7 @@ wait untill text in selector disabppears
     end
     sleep 0.8
     #instance.execute_script( '$(".content.active .newTicket form").submit();' )
-    instance.find_elements( { css: '.active .newTicket button.submit' } )[0].click
+    instance.find_elements( { css: '.active .newTicket button.js-submit' } )[0].click
     sleep 1
     (1..10).each {
       if instance.current_url =~ /#{Regexp.quote('#ticket/zoom/')}/