Improve upgrade_user