User Access Fix

Two minor changes