Improve initial account setting.