changes to User related issues