pw logic on register fix