Added correct references to user table