Improved User updating