Fix address chooser (add security token)