Error messages with correct ID and OTP

Other MWS issues: