Add CMAccount back to fix setup wizard fc