Improved integrity checks during Account unlock process