Share User fixes