PW-13936 - Cart default button / Freight Account Number required fixes