More fixes for loading forms based on userid