diff --git a/changelog/unreleased/39257 b/changelog/unreleased/39257
new file mode 100644
index 000000000000..5ac1ab5018b7
--- /dev/null
+++ b/changelog/unreleased/39257
@@ -0,0 +1,3 @@
+Bugfix: Simplify set password text for new passwords
+
+https://github.com/owncloud/core/pull/39257
diff --git a/settings/templates/setpassword.php b/settings/templates/setpassword.php
index 3d9adc0ee788..e43319c10c12 100644
--- a/settings/templates/setpassword.php
+++ b/settings/templates/setpassword.php
@@ -44,7 +44,7 @@
 		<span id="message"></span>
 		<label id="error-message" class="warning" style="display:none"></label>
 		<button type="submit" id="submit">
-			<span><?php p($l->t('Please set your password')); ?></span>
+			<span><?php p($l->t('Set password')); ?></span>
 			<div class="loading-spinner"><div></div><div></div><div></div><div></div></div>
 		</button>
 	</div>
diff --git a/settings/tests/js/setpasswordSpec.js b/settings/tests/js/setpasswordSpec.js
index bcc1979cd686..36afa5f12ef3 100644
--- a/settings/tests/js/setpasswordSpec.js
+++ b/settings/tests/js/setpasswordSpec.js
@@ -26,7 +26,7 @@ describe('OCA.UserManagement.SetPassword tests', function () {
 			' />' +
 			'<span id="message"></span>' +
 			'</p>' +
-			'<input type="submit" id="submit" value="Please set your password"' +
+			'<input type="submit" id="submit" value="Set password"' +
 			'</fieldset>' +
 			'</form>'
 		);