I had same issue and finally discovered that I was logging in with a pin and now my password. When I signed in with password system restore accepted my password.