More of a long running TODO.  This was added as a note to the "Move user add out of CoreActivity" trello card.