fix regression in skip password logic