Bug during recovery in ChangePasswordV2Ctrl fix

Fixes #1102