Little Fix on HLAWP and Rider Disabled Fields Eapp