diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 266c70846c..4ebd561818 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -49,6 +49,7 @@ use OC\Authentication\Token\DefaultTokenCleanupJob;
 use OC\Authentication\Token\DefaultTokenProvider;
 use OC\Log\Rotate;
 use OC\Preview\BackgroundCleanupJob;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Defaults;
 use OCP\IGroup;
 use OCP\IL10N;
@@ -421,6 +422,9 @@ class Setup {
 			$userSession->login($username, $password);
 			$userSession->createSessionToken($request, $userSession->getUser()->getUID(), $username, $password);
 
+			$session = $userSession->getSession();
+			$session->set('last-password-confirm', \OC::$server->query(ITimeFactory::class)->getTime());
+
 			// Set email for admin
 			if (!empty($options['adminemail'])) {
 				$config->setUserValue($user->getUID(), 'settings', 'email', $options['adminemail']);