Fixing UserText related issues