Revert "Revert "Fix first sharing users""

This reverts commit 784a6d8e3b8b750049633471313a1f932fd8c00e.