Issue #115 Password recovery mechanism fixed