fix #7565 - New_Customer_Portal_205_misc