Bug #698275 - Enable/disable account yields to a several seconds busy loop