diff --git a/administrator/components/com_admin/Model/ProfileModel.php b/administrator/components/com_admin/Model/ProfileModel.php
index 884d4b5413b7b..decc6c033bc23 100644
--- a/administrator/components/com_admin/Model/ProfileModel.php
+++ b/administrator/components/com_admin/Model/ProfileModel.php
@@ -69,11 +69,10 @@ public function getForm($data = array(), $loadData = true)
$form->setFieldAttribute('language', 'type', 'frontend_language', 'params');
}
- // If the user needs to change their password, mark the password fields as required
+ // If the user needs to change their password, mark the password field as required
if (Factory::getUser()->requireReset)
{
$form->setFieldAttribute('password', 'required', 'true');
- $form->setFieldAttribute('password2', 'required', 'true');
}
return $form;
diff --git a/administrator/components/com_admin/View/Profile/HtmlView.php b/administrator/components/com_admin/View/Profile/HtmlView.php
index 8b6185ff31d71..b8544203912c7 100644
--- a/administrator/components/com_admin/View/Profile/HtmlView.php
+++ b/administrator/components/com_admin/View/Profile/HtmlView.php
@@ -69,7 +69,6 @@ public function display($tpl = null)
}
$this->form->setValue('password', null);
- $this->form->setValue('password2', null);
$this->addToolbar();
diff --git a/administrator/components/com_admin/forms/profile.xml b/administrator/components/com_admin/forms/profile.xml
index 77fb1bdce1082..cc0493dc3d436 100644
--- a/administrator/components/com_admin/forms/profile.xml
+++ b/administrator/components/com_admin/forms/profile.xml
@@ -17,23 +17,10 @@
size="30"
/>
-
-
label; ?>
- fieldname == 'password2') : ?>
-
-
input; ?>
diff --git a/administrator/components/com_users/Model/UserModel.php b/administrator/components/com_users/Model/UserModel.php
index 026752de661a3..faa0e06e47ab2 100644
--- a/administrator/components/com_users/Model/UserModel.php
+++ b/administrator/components/com_users/Model/UserModel.php
@@ -148,18 +148,16 @@ public function getForm($data = array(), $loadData = true)
$userId = $form->getValue('id');
- // Passwords fields are required when mail to user is set to No in the joomla user plugin
+ // Password field is required when mail to user is set to No in the joomla user plugin
if ($userId === 0 && $pluginParams->get('mail_to_user', '1') === '0')
{
$form->setFieldAttribute('password', 'required', 'true');
- $form->setFieldAttribute('password2', 'required', 'true');
}
- // If the user needs to change their password, mark the password fields as required
+ // If the user needs to change their password, mark the password field as required
if (Factory::getUser()->requireReset)
{
$form->setFieldAttribute('password', 'required', 'true');
- $form->setFieldAttribute('password2', 'required', 'true');
}
// When multilanguage is set, a user's default site language should also be a Content Language
diff --git a/administrator/components/com_users/View/User/HtmlView.php b/administrator/components/com_users/View/User/HtmlView.php
index d7cb511f4a94e..59702ff538fb4 100644
--- a/administrator/components/com_users/View/User/HtmlView.php
+++ b/administrator/components/com_users/View/User/HtmlView.php
@@ -111,7 +111,6 @@ public function display($tpl = null)
}
$this->form->setValue('password', null);
- $this->form->setValue('password2', null);
parent::display($tpl);
$this->addToolbar();
diff --git a/administrator/components/com_users/forms/user.xml b/administrator/components/com_users/forms/user.xml
index 11de26f71648d..864844a1eb343 100644
--- a/administrator/components/com_users/forms/user.xml
+++ b/administrator/components/com_users/forms/user.xml
@@ -30,19 +30,6 @@
size="30"
/>
-
-
setUserState('com_users.edit.profile.data', $requestData);
diff --git a/components/com_users/Model/ProfileModel.php b/components/com_users/Model/ProfileModel.php
index 883a9adacd1bb..3f20cb1fd733e 100644
--- a/components/com_users/Model/ProfileModel.php
+++ b/components/com_users/Model/ProfileModel.php
@@ -157,8 +157,8 @@ public function getData()
$this->data->$k = $v;
}
- // Unset the passwords.
- unset($this->data->password1, $this->data->password2);
+ // Unset the password.
+ unset($this->data->password1);
$registry = new Registry($this->data->params);
$this->data->params = $registry->toArray();
@@ -223,7 +223,6 @@ public function getForm($data = array(), $loadData = true)
if (Factory::getUser()->requireReset)
{
$form->setFieldAttribute('password1', 'required', 'true');
- $form->setFieldAttribute('password2', 'required', 'true');
}
return $form;
diff --git a/components/com_users/Model/RegistrationModel.php b/components/com_users/Model/RegistrationModel.php
index 710c9e01dc316..d2db2a1349ad2 100644
--- a/components/com_users/Model/RegistrationModel.php
+++ b/components/com_users/Model/RegistrationModel.php
@@ -335,8 +335,8 @@ public function getData()
$this->data->groups[] = $system;
- // Unset the passwords.
- unset($this->data->password1, $this->data->password2);
+ // Unset the password.
+ unset($this->data->password1);
// Get the dispatcher and load the users plugins.
PluginHelper::importPlugin('user');
diff --git a/components/com_users/forms/profile.xml b/components/com_users/forms/profile.xml
index fdbf7f28ee156..73feed24552b7 100644
--- a/components/com_users/forms/profile.xml
+++ b/components/com_users/forms/profile.xml
@@ -39,19 +39,6 @@
validate="password"
/>
-
-
-
-
-
diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini
index ed9c063c98b86..003adfb28f7a7 100644
--- a/language/en-GB/en-GB.com_users.ini
+++ b/language/en-GB/en-GB.com_users.ini
@@ -34,8 +34,6 @@ COM_USERS_FIELD_RESET_CONFIRM_TOKEN_DESC="Enter the password reset verification
COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL="Verification Code"
COM_USERS_FIELD_RESET_CONFIRM_USERNAME_LABEL="Username"
COM_USERS_FIELD_RESET_PASSWORD1_LABEL="Password"
-COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
-COM_USERS_FIELD_RESET_PASSWORD2_LABEL="Confirm Password"
COM_USERS_INVALID_EMAIL="Invalid email address"
COM_USERS_LOGIN_IMAGE_ALT="Login image"
COM_USERS_LOGIN_REGISTER="Don't have an account?"
@@ -71,8 +69,6 @@ COM_USERS_PROFILE_OTEPS="One time emergency passwords"
COM_USERS_PROFILE_OTEPS_DESC="If you do not have access to your two factor authentication device you can use any of the following passwords instead of a regular security code. Each one of these emergency passwords is immediately destroyed upon use. We recommend printing these passwords out and keeping the printout in a safe and accessible location, eg your wallet or a safety deposit box."
COM_USERS_PROFILE_OTEPS_WAIT_DESC="There are no emergency one time passwords generated in your account. The passwords will be generated automatically and displayed here as soon as you activate two factor authentication."
COM_USERS_PROFILE_PASSWORD1_LABEL="Password"
-COM_USERS_PROFILE_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
-COM_USERS_PROFILE_PASSWORD2_LABEL="Confirm Password"
COM_USERS_PROFILE_REGISTERED_DATE_LABEL="Registered Date"
COM_USERS_PROFILE_SAVE_FAILED="Profile could not be saved: %s"
COM_USERS_PROFILE_SAVE_SUCCESS="Profile saved."
diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini
index d254833d98b70..9613f0ac195cf 100644
--- a/language/en-GB/en-GB.lib_joomla.ini
+++ b/language/en-GB/en-GB.lib_joomla.ini
@@ -733,7 +733,6 @@ JLIB_USER_ERROR_CANNOT_DEMOTE_SELF="You can't remove your own Super User permiss
JLIB_USER_ERROR_CANNOT_REUSE_PASSWORD="You can't reuse your current password, please enter a new password."
JLIB_USER_ERROR_ID_NOT_EXISTS="JUser: :_load: User %s does not exist."
JLIB_USER_ERROR_NOT_SUPERADMIN="Only users with Super User permissions can change other Super User user accounts."
-JLIB_USER_ERROR_PASSWORD_NOT_MATCH="Passwords do not match. Please re-enter password."
JLIB_USER_ERROR_UNABLE_TO_FIND_USER="Unable to find a user with given activation string."
JLIB_USER_ERROR_UNABLE_TO_LOAD_USER="JUser: :_load: Unable to load user with ID: %s"
JLIB_USER_EXCEPTION_ACCESS_USERGROUP_INVALID="User group does not exist."
diff --git a/libraries/src/User/User.php b/libraries/src/User/User.php
index 451c1fe0820cc..58e9e0529217f 100644
--- a/libraries/src/User/User.php
+++ b/libraries/src/User/User.php
@@ -582,16 +582,6 @@ public function bind(&$array)
if (empty($array['password']))
{
$array['password'] = UserHelper::genRandomPassword();
- $array['password2'] = $array['password'];
- }
-
- // Not all controllers check the password, although they should.
- // Hence this code is required:
- if (isset($array['password2']) && $array['password'] != $array['password2'])
- {
- Factory::getApplication()->enqueueMessage(Text::_('JLIB_USER_ERROR_PASSWORD_NOT_MATCH'), 'error');
-
- return false;
}
$this->password_clear = ArrayHelper::getValue($array, 'password', '', 'string');
@@ -615,13 +605,6 @@ public function bind(&$array)
// Updating an existing user
if (!empty($array['password']))
{
- if ($array['password'] != $array['password2'])
- {
- $this->setError(Text::_('JLIB_USER_ERROR_PASSWORD_NOT_MATCH'));
-
- return false;
- }
-
$this->password_clear = ArrayHelper::getValue($array, 'password', '', 'string');
// Check if the user is reusing the current password if required to reset their password