Thanks markhx (and all).
It seemed to solve the problem.
I tested with both a new user and as an existing user – changing the password via “lost” password link.
And didn’t get stuck.
I ended up changing all usernames to equal email addresses- as sometimes I was trying to use the email when it wanted a username and vice versa- adding user error to the mix.
??
