[RAFC-144] Fix condition not working on account_type changes

Merged Macarena Meldi requested to merge 12.0-stage-RAFC144 into 12.0-stage

Merge request reports