Fix for users with special characters