APF-1391 - Password Recovery (wip)