diff --git a/plugins/enigma/skins/elastic/templates/keycreate.html b/plugins/enigma/skins/elastic/templates/keycreate.html
index db2d91d23..7b31affc2 100644
--- a/plugins/enigma/skins/elastic/templates/keycreate.html
+++ b/plugins/enigma/skins/elastic/templates/keycreate.html
@@ -7,7 +7,7 @@
-
+
diff --git a/plugins/managesieve/skins/elastic/templates/filteredit.html b/plugins/managesieve/skins/elastic/templates/filteredit.html
index fa2fc3884..28e065d94 100644
--- a/plugins/managesieve/skins/elastic/templates/filteredit.html
+++ b/plugins/managesieve/skins/elastic/templates/filteredit.html
@@ -10,7 +10,7 @@
-
+
diff --git a/plugins/managesieve/skins/elastic/templates/setedit.html b/plugins/managesieve/skins/elastic/templates/setedit.html
index 542378b54..9bb5db8e8 100644
--- a/plugins/managesieve/skins/elastic/templates/setedit.html
+++ b/plugins/managesieve/skins/elastic/templates/setedit.html
@@ -7,7 +7,7 @@
-
+
diff --git a/plugins/managesieve/skins/elastic/templates/seteditraw.html b/plugins/managesieve/skins/elastic/templates/seteditraw.html
index 7c73e65d4..21e584d6f 100644
--- a/plugins/managesieve/skins/elastic/templates/seteditraw.html
+++ b/plugins/managesieve/skins/elastic/templates/seteditraw.html
@@ -7,7 +7,7 @@
-
+
diff --git a/plugins/managesieve/skins/elastic/templates/vacation.html b/plugins/managesieve/skins/elastic/templates/vacation.html
index aa97da9d6..9aa2500cb 100644
--- a/plugins/managesieve/skins/elastic/templates/vacation.html
+++ b/plugins/managesieve/skins/elastic/templates/vacation.html
@@ -15,7 +15,7 @@
-
+
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 72907ab79..36ae68b70 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -279,7 +279,7 @@ class password extends rcube_plugin
$submit_button = $rcmail->output->button(array(
'command' => 'plugin.password-save',
- 'class' => 'button mainaction save',
+ 'class' => 'button mainaction submit',
'label' => 'save',
));
$form_buttons = html::p(array('class' => 'formbuttons'), $submit_button);