Added #prefix# to user table references