slight change to check correct user