Added password recovery - fixes #24