Yeah, I also prefer the approach @Bastien_Siebman mentions that @lpb has proposed here which can actually be automated using iDO’s awesome rule as @Arthur_BEGOU has documented here.
It also uses one rule action instead of two, which should be considered for Starter and Advanced tiers, due to their monthly limitations of rule actions