more sensible way of fixing weird change password prompt