FIX for APF-1391 Password Recovery