BKNDLSS-4790 afterRestorePassword inconsistency