Added password recovery from issue #8