merged User and user table updates from Will