diff --git a/app/components/Account/AccountSelector.jsx b/app/components/Account/AccountSelector.jsx
index 6b90231650..e69fb5408d 100644
--- a/app/components/Account/AccountSelector.jsx
+++ b/app/components/Account/AccountSelector.jsx
@@ -52,6 +52,7 @@ class AccountSelector extends React.Component {
         allowUppercase: PropTypes.bool, // use it if you need to allow uppercase letters
         typeahead: PropTypes.bool,
         excludeAccounts: PropTypes.array, // array of accounts to exclude from the typeahead
+        includeMyActiveAccounts: PropTypes.bool, // whether to include my active accounts in the list
         focus: PropTypes.bool,
         disabled: PropTypes.bool,
         editable: PropTypes.bool,
@@ -63,6 +64,7 @@ class AccountSelector extends React.Component {
     static defaultProps = {
         autosubscribe: false,
         excludeAccounts: [],
+        includeMyActiveAccounts: true,
         disabled: null,
         editable: null,
         locked: false,
@@ -86,9 +88,11 @@ class AccountSelector extends React.Component {
         if (accountName) {
             this._addThisToIndex(accountName);
         }
-        this.props.myActiveAccounts.map(a => {
-            this._addThisToIndex(a);
-        });
+        if (this.props.includeMyActiveAccounts) {
+            this.props.myActiveAccounts.map(a => {
+                this._addThisToIndex(a);
+            });
+        }
         this.props.contacts.map(a => {
             this._addThisToIndex(a);
         });
@@ -458,18 +462,7 @@ class AccountSelector extends React.Component {
             error ||
             disableActionButton;
 
-        if (selectedAccount && selectedAccount.isOwnAccount) {
-            linked_status = (
-                <Tooltip
-                    placement="top"
-                    title={counterpart.translate("tooltip.own_account")}
-                >
-                    <span className="tooltip green">
-                        <AntIcon type="user" />
-                    </span>
-                </Tooltip>
-            );
-        } else if (selectedAccount && selectedAccount.isKnownScammer) {
+        if (selectedAccount && selectedAccount.isKnownScammer) {
             linked_status = (
                 <Tooltip
                     placement="top"
@@ -492,6 +485,17 @@ class AccountSelector extends React.Component {
                     </span>
                 </Tooltip>
             );
+        } else if (selectedAccount && selectedAccount.isOwnAccount) {
+            linked_status = (
+                <Tooltip
+                    placement="top"
+                    title={counterpart.translate("tooltip.own_account")}
+                >
+                    <span className="tooltip green">
+                        <AntIcon type="user" />
+                    </span>
+                </Tooltip>
+            );
         } else if (selectedAccount) {
             linked_status = (
                 <Tooltip
@@ -523,7 +527,7 @@ class AccountSelector extends React.Component {
                         return null;
                     }
                     if (
-                        account.data.isOwnAccount ||
+                        (this.props.includeMyActiveAccount && account.data.isOwnAccount) ||
                         (!this.props.locked && account.data.isContact) ||
                         (accountName && account.data.name === accountName)
                     ) {
@@ -548,15 +552,13 @@ class AccountSelector extends React.Component {
                             value={account.data.name}
                             disabled={account.data.disabled ? true : undefined}
                         >
-                            {account.data.isOwnAccount ? (
-                                <AntIcon type="user" />
-                            ) : null}
-                            {account.data.isContact ? (
-                                <AntIcon type="star" />
-                            ) : null}
                             {account.data.isKnownScammer ? (
                                 <AntIcon type="warning" />
-                            ) : null}
+                            ) : (account.data.isContact ? (
+                                <AntIcon type="star" />
+                            ) : (account.data.isOwnAccount ? (
+                                <AntIcon type="user" />
+                            ) : null) ) }
                             &nbsp;
                             {account.data.name}
                             <span style={{float: "right"}}>
@@ -667,11 +669,11 @@ class AccountSelector extends React.Component {
                     <label
                         className={cnames(
                             "right-label",
-                            selectedAccount.isContact ||
-                            selectedAccount.isOwnAccount
-                                ? "positive"
-                                : null,
-                            selectedAccount.isKnownScammer ? "negative" : null
+                            selectedAccount.isKnownScammer ? "negative" : (
+                                selectedAccount.isContact ||
+                                selectedAccount.isOwnAccount
+                                    ? "positive"
+                                    : null )
                         )}
                         style={{marginTop: -30}}
                     >
diff --git a/app/components/Modal/SendModal.jsx b/app/components/Modal/SendModal.jsx
index 2e9a3f1d42..fa9d332f36 100644
--- a/app/components/Modal/SendModal.jsx
+++ b/app/components/Modal/SendModal.jsx
@@ -616,6 +616,7 @@ class SendModal extends React.Component {
                                         this
                                     )}
                                     typeahead={true}
+                                    includeMyActiveAccounts={false}
                                     tabIndex={tabIndex++}
                                 />
 
diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js
index fd22bf4e62..f3f2ec9ffa 100644
--- a/app/lib/common/scamAccounts.js
+++ b/app/lib/common/scamAccounts.js
@@ -20,7 +20,9 @@ export const scamAccountsPolo = [
     "poloniex",
     "1.2.2340",
     "poloneix",
-    "1.2.24900"
+    "1.2.24900",
+    "poloniexeos1",
+    "1.2.1049362"
 ];
 
 export const scamAccountsBittrex = [
@@ -35,7 +37,9 @@ export const scamAccountsBittrex = [
     "bittrex",
     "1.2.2343",
     "bittrex-deposits",
-    "1.2.161093"
+    "1.2.161093",
+    "bittrexacct1",
+    "1.2.1649570"
 ];
 
 export const scamAccountsOther = [
@@ -1469,6 +1473,34 @@ export const scamAccountsOther = [
     "1.2.1795566",
     "aex-bts-deposite-walet",
     "1.2.1795541",
+    "aex-bts-deposit-wellat",
+    "1.2.1799240",
+    "bineance-bts-1",
+    "1.2.1799262",
+    "juhiy011-01",
+    "1.2.1798466",
+    "huoboi-pro",
+    "1.2.1799492",
+    "sarkie1337",
+    "1.2.1799478",
+    "niegoe9ia",
+    "1.2.1799397",
+    "botgate11",
+    "1.2.1799462",
+    "zblbts001",
+    "1.2.1799353",
+    "gate-bts-io66",
+    "1.2.1798716",
+    "houdi-pro",
+    "1.2.1795562",
+    "binaince-bts-1",
+    "1.2.1798345",
+    "hujoyy-131hk",
+    "1.2.1799561",
+    "hitxxxrav25",
+    "1.2.1799380",
+    "subzyng11",
+    "1.2.1799563",
     "aex-bts-withdrawal-wallet-security",
     "1.2.1694852",
     "citadel-one",
@@ -1779,6 +1811,10 @@ export const scamAccountsOther = [
     "1.2.1673663",
     "gliofdr229",
     "1.2.1671362",
+    "pocits-team",
+    "1.2.1702279",
+    "committee.blacklist-manager",
+    "1.2.1799121",
     "bitcoin-wizards",
     "1.2.457302",
     "leon38marokko",
@@ -1846,5 +1882,201 @@ export const scamAccountsOther = [
     "vezunchik-account",
     "1.2.462216",
     "razdacha-bts",
-    "1.2.1646336"
+    "1.2.1646336",
+    // EOS
+    "coinbasebase",
+    "1.2.1603952",
+    "accountcreat",
+    "1.2.1799179",
+    "atomintlexch",
+    "1.2.1799180",
+    "bcgame222333",
+    "1.2.1799181",
+    "bcgameeoswin",
+    "1.2.1799182",
+    "beexpayioeos",
+    "1.2.1799183",
+    "bikicoineos5",
+    "1.2.1593635",
+    "bilaxyeos111",
+    "1.2.1799184",
+    "bitforexcoin",
+    "1.2.1596635",
+    "bithumbeos15",
+    "1.2.1677135",
+    "bithumbrecv1",
+    "1.2.1635360",
+    "bitmaxaddrz1",
+    "1.2.1109244",
+    "bitoctoeosio",
+    "1.2.1799185",
+    "bitruebitrue",
+    "1.2.1799186",
+    "bitvavodepos",
+    "1.2.1799187",
+    "bkexeosusers",
+    "1.2.1234827",
+    "btcturkeosio",
+    "1.2.1761232",
+    "btflwnetex24",
+    "1.2.1799188",
+    "bweosdeposit",
+    "1.2.1282180",
+    "bybitdeposit",
+    "1.2.1761243",
+    "catexioeosio",
+    "1.2.1799189",
+    "changenoweos",
+    "1.2.1799119",
+    "coinboxstore",
+    "1.2.1799190",
+    "coincolasave",
+    "1.2.1653599",
+    "coinealeoswa",
+    "1.2.1799191",
+    "coinexviabtc",
+    "1.2.1087752",
+    "coinonekorea",
+    "1.2.1150124",
+    "coinspoteos1",
+    "1.2.1603157",
+    "crexpayments",
+    "1.2.1799192",
+    "cryptocomeos",
+    "1.2.1761230",
+    "cryptomkteos",
+    "1.2.1799193",
+    "ctforeos2222",
+    "1.2.1147939",
+    "dcoindeposit",
+    "1.2.1212186",
+    "dfttothemoon",
+    "1.2.1158646",
+    "e1k2m1ynpoof",
+    "1.2.1703024",
+    "eoshoowallet",
+    "1.2.1080697",
+    "eosprimedice",
+    "1.2.1799194",
+    "eosupbitsusr",
+    "1.2.1703357",
+    "eoswithmixin",
+    "1.2.1212806",
+    "exmodeposits",
+    "1.2.1799195",
+    "exodussignup",
+    "1.2.1689962",
+    "freewalletin",
+    "1.2.1797385",
+    "gopaxdeposit",
+    "1.2.1150123",
+    "gxgxcomtotal",
+    "1.2.1799196",
+    "gyztsojzgage",
+    "1.2.1799197",
+    "hitbtcpayins",
+    "1.2.1080701",
+    "hotbitioeoss",
+    "1.2.1606463",
+    "hotbitkorean",
+    "1.2.1799198",
+    "ilovebityard",
+    "1.2.1799199",
+    "indodaxaccnt",
+    "1.2.1594372",
+    "koineksadres",
+    "1.2.1594877",
+    "korbiteosdep",
+    "1.2.1797390",
+    "kunaexchange",
+    "1.2.1211841",
+    "latokeneos11",
+    "1.2.1799200",
+    "lbkexdeposit",
+    "1.2.1637485",
+    "luckyfish321",
+    "1.2.1799201",
+    "makeaccounts",
+    "1.2.1799202",
+    "mathmathmath",
+    "1.2.1794559",
+    "mercatoxeos1",
+    "1.2.1604773",
+    "metalcccceos",
+    "1.2.1799203",
+    "mxcexdeposit",
+    "1.2.1261064",
+    "myeostokenin",
+    "1.2.1799204",
+    "nobitexeosw1",
+    "1.2.1799205",
+    "okcoincomeos",
+    "1.2.1761246",
+    "orinocotrade",
+    "1.2.1799206",
+    "paribuwallet",
+    "1.2.1273867",
+    "probitwallet",
+    "1.2.1799207",
+    "radardeposit",
+    "1.2.1653604",
+    "stakecasino1",
+    "1.2.1799208",
+    "th3f4tw4113t",
+    "1.2.1681437",
+    "tokenbankpro",
+    "1.2.1211831",
+    "trustbitopro",
+    "1.2.1799209",
+    "unocoinindia",
+    "1.2.1799210",
+    "useosbinance",
+    "1.2.1761231",
+    "utexiopayin1",
+    "1.2.1799211",
+    "uytt1epvvwtn",
+    "1.2.1799212",
+    "wablockchain",
+    "1.2.1799213",
+    "walleteos125",
+    "1.2.1700871",
+    "whaleextrust",
+    "1.2.1147873",
+    "x1bitpaygate",
+    "1.2.1799214",
+    "xq3bcloi5tox",
+    "1.2.1799215",
+    "youhodlereos",
+    "1.2.1799216",
+    "yuo4dirjxmz4",
+    "1.2.1799217",
+    "z1wdmuuosmes",
+    "1.2.1770761",
+    "zebpaypayins",
+    "1.2.1799218",
+    // STEEM
+    "bitsonicpro",
+    "1.2.1799436",
+    "bitvavo",
+    "1.2.1785173",
+    "deepcrypto8",
+    "1.2.1211130",
+    "deposit-kr",
+    "1.2.1787961",
+    "gateiodeposit",
+    "1.2.1783716",
+    "ionomy",
+    "1.2.1799435",
+    "mxcsteem",
+    "1.2.1785904",
+    "orinoco",
+    "1.2.1794558",
+    "probitsteem",
+    "1.2.1791239",
+    "receiver-kr",
+    "1.2.1787962",
+    "receiver-pro",
+    "1.2.1787963",
+    "user.dunamu",
+    "1.2.1761235"
 ];
diff --git a/charting_library/install-charting-library.js b/charting_library/install-charting-library.js
index 9477bec18b..e0336270df 100644
--- a/charting_library/install-charting-library.js
+++ b/charting_library/install-charting-library.js
@@ -18,6 +18,7 @@ http.get("https://bitshares.org/assets/" + outputFileName, (response) => {
 }).on("error", (err) => {
     console.error("Failed to download charting_library archive");
     console.error(err);
+    throw (err);
 });
 
 outputFile.on("finish", () => {