Fix issue with new users