Database changes

Change code to match changes to Users table.