add autocomplete to account, merge new ub_15