diff --git a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
index 3ef490b0e4b12..a6c061c325052 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
@@ -64,7 +64,8 @@
id="login-password"
name="password"
data-bind="attr: {autocomplete: autocomplete}"
- data-validate="{required:true, 'validate-password':true}"/>
+ data-validate="{required:true, 'validate-password':true}"
+ autocomplete="off"/>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
index c8759eff33483..ee06bc04dd513 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -42,19 +42,19 @@
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 374e576d26e2d..d5429fc77e3e6 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -140,13 +140,13 @@
getChildHtml('form_additional_info'); ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
index fecee7f748b4e..7d68d4a2e8c79 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
@@ -18,13 +18,13 @@
diff --git a/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php b/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
index c743e7c17a5a7..ddd686258e333 100644
--- a/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
+++ b/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
@@ -210,6 +210,7 @@ public function saveTranslate($string, $translate, $locale = null, $storeId = nu
{
$connection = $this->getConnection();
$table = $this->getMainTable();
+ $translate = htmlspecialchars($translate, ENT_QUOTES);
if ($locale === null) {
$locale = $this->_localeResolver->getLocale();
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
index 210b231afc8fb..4df739801abf4 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
@@ -15,13 +15,13 @@