Fixes user account add/update