Fixing issues with new user