Fixes for merge and delete of new users