diff --git a/e2e-tests/manager/10-saml-config.js b/e2e-tests/manager/10-saml-config.js
index 2dbc0e6fe..b638e4b2c 100644
--- a/e2e-tests/manager/10-saml-config.js
+++ b/e2e-tests/manager/10-saml-config.js
@@ -23,10 +23,10 @@ describe('Lemonldap::NG Manager', function() {
       element(by.id('a-samlServiceSecurity')).click()
       element(by.id('t-samlServiceSecuritySig')).click()
       element(by.css('.glyphicon-plus-sign')).click();
-      element(by.xpath("//button[@trspan='ok']")).click();
+      element(by.id('passwordok')).click();
       element(by.id('t-samlServiceSecurityEnc')).click()
       element(by.css('.glyphicon-plus-sign')).click();
-      element(by.xpath("//button[@trspan='ok']")).click();
+      element(by.id('passwordok')).click();
       element(by.id('a-samlOrganization')).click();
       element(by.id('t-samlOrganizationDisplayName')).click();
       element(by.id('textinput')).clear().sendKeys('Org1');
@@ -36,7 +36,7 @@ describe('Lemonldap::NG Manager', function() {
     it('should save new configuration', function() {
       element(by.id('save')).click();
       element(by.id('longtextinput')).sendKeys('Activate SAML');
-      element(by.xpath("//button[@trspan='ok']")).click();
+      element(by.id('saveok')).click();
       expect(element(by.id('cfgnum')).getText()).toEqual('2');
     });
   });
diff --git a/lemonldap-ng-manager/site/templates/manager.tpl b/lemonldap-ng-manager/site/templates/manager.tpl
index 1cf2e4152..118ebf8e9 100644
--- a/lemonldap-ng-manager/site/templates/manager.tpl
+++ b/lemonldap-ng-manager/site/templates/manager.tpl
@@ -93,7 +93,7 @@
       </ul>
     </div>
     <div class="modal-footer">
-      <button class="btn btn-primary" ng-click="ok()" trspan="ok"></button>
+      <button class="btn btn-primary" id="nessageok" ng-click="ok()" trspan="ok"></button>
       <button class="btn btn-warning" ng-click="cancel()" ng-if="elem('message').displayCancel" trspan="cancel"></button>
     </div>
   </script>
@@ -117,7 +117,7 @@
       </div>
     </div>
     <div class="modal-footer">
-      <button class="btn btn-primary" ng-click="ok()" trspan="ok"></button>
+      <button class="btn btn-primary" id="passwordok" ng-click="ok()" trspan="ok"></button>
       <button class="btn btn-warning" ng-click="cancel()" trspan="cancel"></button>
     </div>
   </script>
@@ -134,7 +134,7 @@
       </div>
     </div>
     <div class="modal-footer">
-      <button class="btn btn-primary" ng-click="ok()" trspan="ok"></button>
+      <button class="btn btn-primary" id="saveok" ng-click="ok()" trspan="ok"></button>
       <button class="btn btn-warning" ng-click="cancel()" trspan="cancel"></button>
     </div>
   </script>