CS fixes for FeatureContext in Account module
[skip ci]