diff --git a/apps/user_ldap/css/renewPassword.css b/apps/user_ldap/css/renewPassword.css
index a06a101efe5..03fe2bccd88 100644
--- a/apps/user_ldap/css/renewPassword.css
+++ b/apps/user_ldap/css/renewPassword.css
@@ -18,3 +18,8 @@
 #renewpassword .title {
 	background-color: transparent;
 }
+
+input.primary,
+button.primary {
+	background-color: #00a2e9 !important;
+}
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index f342785ee03..69e1f3c52f4 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -346,7 +346,7 @@ class Access extends LDAPUtility implements IUserTools {
 			return false;
 		}
 		try {
-			return $this->invokeLDAPMethod('modReplace', $cr, $userDN, $password);
+			return @$this->invokeLDAPMethod('modReplace', $cr, $userDN, $password);
 		} catch(ConstraintViolationException $e) {
 			throw new HintException('Password change rejected.', \OC::$server->getL10N('user_ldap')->t('Password change rejected. Hint: ').$e->getMessage(), $e->getCode());
 		}
diff --git a/apps/user_ldap/lib/AppInfo/Application.php b/apps/user_ldap/lib/AppInfo/Application.php
index c3fa1ce9f94..2188605b5e8 100644
--- a/apps/user_ldap/lib/AppInfo/Application.php
+++ b/apps/user_ldap/lib/AppInfo/Application.php
@@ -45,6 +45,7 @@ class Application extends App {
 				$c->query('UserManager'),
 				$server->getConfig(),
 				$c->query('OCP\IL10N'),
+				$c->query('Session'),
 				$server->getURLGenerator()
 			);
 		});
diff --git a/apps/user_ldap/lib/Controller/RenewPasswordController.php b/apps/user_ldap/lib/Controller/RenewPasswordController.php
index 4714c0646cd..9cdcdddb141 100644
--- a/apps/user_ldap/lib/Controller/RenewPasswordController.php
+++ b/apps/user_ldap/lib/Controller/RenewPasswordController.php
@@ -146,7 +146,7 @@ class RenewPasswordController extends Controller {
 				$this->session->set('loginMessages', [
 					[], [$this->l10n->t("Please login with the new password")]
 				]);
-				$this->session->remove('needPasswordRenewal');
+				$this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
 				return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
 			} else {
 				$this->session->set('renewPasswordMessages', [