diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
index 7bc15e5b6747..b25c0f91ab41 100644
--- a/packages/rocketchat-lib/server/startup/settings.js
+++ b/packages/rocketchat-lib/server/startup/settings.js
@@ -74,6 +74,11 @@ RocketChat.settings.addGroup('Accounts', function() {
 		'public': true,
 		i18nLabel: 'Placeholder_for_password_login_field'
 	});
+	this.add('Accounts_ConfirmPasswordPlaceholder', '', {
+		type: 'string',
+		'public': true,
+		i18nLabel: 'Placeholder_for_password_login_field'
+	});
 	this.add('Accounts_ForgetUserSessionOnWindowClose', false, {
 		type: 'boolean',
 		'public': true
diff --git a/packages/rocketchat-ui-login/client/login/form.html b/packages/rocketchat-ui-login/client/login/form.html
index ef5277bf675c..26573b5b653b 100644
--- a/packages/rocketchat-ui-login/client/login/form.html
+++ b/packages/rocketchat-ui-login/client/login/form.html
@@ -85,7 +85,7 @@ <h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
 									<div class="rc-input__wrapper">
 										<input name="confirm-pass" id="confirm-pass" type="password" class="rc-input__element"
 											autocapitalize="off" autocorrect="off"
-											placeholder="{{passwordPlaceholder}}" autofocus>
+											placeholder="{{confirmPasswordPlaceholder}}" autofocus>
 										<div class="input-error"></div>
 									</div>
 								</label>
diff --git a/packages/rocketchat-ui-login/client/login/form.js b/packages/rocketchat-ui-login/client/login/form.js
index 96eb5b70fdc7..dd1999af1c44 100644
--- a/packages/rocketchat-ui-login/client/login/form.js
+++ b/packages/rocketchat-ui-login/client/login/form.js
@@ -58,6 +58,9 @@ Template.loginForm.helpers({
 	passwordPlaceholder() {
 		return RocketChat.settings.get('Accounts_PasswordPlaceholder') || t('Password');
 	},
+	confirmPasswordPlaceholder() {
+		return RocketChat.settings.get('Accounts_ConfirmPasswordPlaceholder') || t('Confirm_password');
+	},
 	hasOnePassword() {
 		return typeof OnePassword !== 'undefined' && OnePassword.findLoginForUrl && typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios';
 	},