Fix several issues with account selection and adding bookmarks.