(hopefully) fix exit from CMAccount setup

Change-Id: I4a400ad3733f875dd930be93a9f591a973e65fe6