password retrieval service fixes