Fix change password wrapping