diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json
index a84fd364c3..d5c8ec8d82 100644
--- a/app/assets/locales/locale-de.json
+++ b/app/assets/locales/locale-de.json
@@ -106,9 +106,10 @@
         "no_price": "--",
         "open_orders": "Offene Aufträge",
         "optional": {
-            "formatter": "Optional, {restore_link} oder erstellen Sie ein Konto mit {restore_form}.",
+            "formatter": "Optional, {restore_link} oder {restore_link_brain}.",
             "restore_form": "Formular",
-            "restore_link": "stellen Sie Ihr Konto wiederher"
+            "restore_link": "stellen Sie Ihr Konto wiederher",
+            "restore_link_brain": "stellen Sie Ihr Konto mit dem Brain-Key wieder her"
         },
         "options": {
             "memo_key": "Notitz-Schlüssel",
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
index 38dbeb02ef..9742a4d610 100644
--- a/app/assets/locales/locale-en.json
+++ b/app/assets/locales/locale-en.json
@@ -107,9 +107,10 @@
         "no_price": "--",
         "open_orders": "Open Orders",
         "optional": {
-            "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
+            "formatter": "Optionally, {restore_link} or {restore_link_brain}.",
             "restore_form": "advanced form",
-            "restore_link": "restore your account"
+            "restore_link": "restore your account from backup",
+            "restore_link_brain": "restore your account using brain-key"
         },
         "options": {
             "memo_key": "Memo Key",
diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json
index 3ff245f071..ea0438d3ac 100644
--- a/app/assets/locales/locale-es.json
+++ b/app/assets/locales/locale-es.json
@@ -106,9 +106,10 @@
         "no_price": "--",
         "open_orders": "Ordenes abiertas",
         "optional": {
-            "formatter": "Opcionalmente, {restore_link} o crea una cuenta usando el {restore_form}.",
+            "formatter": "Opcionalmente, {restore_link} o {restore_link_brain}.",
             "restore_form": "forma avanzada",
-            "restore_link": "restaurar su cuenta"
+            "restore_link": "restaurar su cuenta",
+            "restore_link_brain": "restaura tu cuenta usando la tecla cerebral"
         },
         "options": {
             "memo_key": "Llave Memo",
diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json
index c9ae81b70e..557c48f6e7 100644
--- a/app/assets/locales/locale-fr.json
+++ b/app/assets/locales/locale-fr.json
@@ -106,9 +106,10 @@
         "no_price": "--",
         "open_orders": "Open Orders",
         "optional": {
-            "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
+            "formatter": "Optionally, {restore_link} or {restore_link_brain}.",
             "restore_form": "advanced form",
-            "restore_link": "restore your account"
+            "restore_link": "restore your account from backup",
+            "restore_link_brain": "restore your account using brain-key"
         },
         "options": {
             "memo_key": "Memo Key",
diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json
index 6012ea1a6f..9bc74e9d6f 100644
--- a/app/assets/locales/locale-it.json
+++ b/app/assets/locales/locale-it.json
@@ -106,9 +106,10 @@
         "no_price": "Valore sconosciuto",
         "open_orders": "Ordini aperti",
         "optional": {
-            "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
+            "formatter": "Optionally, {restore_link} or {restore_link_brain}.",
             "restore_form": "advanced form",
-            "restore_link": "restore your account"
+            "restore_link": "restore your account from backup",
+            "restore_link_brain": "restore your account using brain-key"
         },
         "options": {
             "memo_key": "Chiave Memo",
diff --git a/app/assets/locales/locale-ja.json b/app/assets/locales/locale-ja.json
index e61fcd6115..e4cdd81cc8 100644
--- a/app/assets/locales/locale-ja.json
+++ b/app/assets/locales/locale-ja.json
@@ -106,9 +106,10 @@
         "no_price": "不明な値",
         "open_orders": "注文中",
         "optional": {
-            "formatter": "ここから{restore_link}、または{restore_form}を使ってアカウントを作成することができます。",
+            "formatter": "オプションで、{restore_link} または {restore_link_brain}",
             "restore_form": "高度設定フォーム",
-            "restore_link": "アカウントのリストア"
+            "restore_link": "アカウントのリストア",
+            "restore_link_brain": "ブレインキーを使ってアカウントを復元する"
         },
         "options": {
             "memo_key": "メモキー",
diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json
index 9cb8bb474b..5078da8c37 100644
--- a/app/assets/locales/locale-ko.json
+++ b/app/assets/locales/locale-ko.json
@@ -106,9 +106,10 @@
         "no_price": "--",
         "open_orders": "Open Orders",
         "optional": {
-            "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
+            "formatter": "Optionally, {restore_link} or {restore_link_brain}.",
             "restore_form": "advanced form",
-            "restore_link": "restore your account"
+            "restore_link": "restore your account from backup",
+            "restore_link_brain": "restore your account using brain-key"
         },
         "options": {
             "memo_key": "메모 키",
diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json
index b9d919668b..b705151fe6 100644
--- a/app/assets/locales/locale-ru.json
+++ b/app/assets/locales/locale-ru.json
@@ -108,7 +108,8 @@
         "optional": {
             "formatter": "При необходимости {restore_link} или создайте аккаунт с помощью {restore_form}.",
             "restore_form": "расширенная форма",
-            "restore_link": "восстановить аккаунт"
+            "restore_link": "восстановить аккаунт из резервной копии",
+            "restore_link_brain": "восстановить аккаунт, используя ключ"
         },
         "options": {
             "memo_key": "Мемо-ключ",
diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json
index fc7811003c..60cf7d097c 100644
--- a/app/assets/locales/locale-tr.json
+++ b/app/assets/locales/locale-tr.json
@@ -106,9 +106,10 @@
         "no_price": "Fiyat mevcut değil",
         "open_orders": "Açık Emirler",
         "optional": {
-            "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
+            "formatter": "Optionally, {restore_link} or {restore_link_brain}.",
             "restore_form": "advanced form",
-            "restore_link": "restore your account"
+            "restore_link": "restore your account from backup",
+            "restore_link_brain": "restore your account using brain-key"
         },
         "options": {
             "memo_key": "Memo Anahtarı",
diff --git a/app/assets/locales/locale-zh.json b/app/assets/locales/locale-zh.json
index c3a28c93ea..fec290cb70 100644
--- a/app/assets/locales/locale-zh.json
+++ b/app/assets/locales/locale-zh.json
@@ -106,9 +106,10 @@
         "no_price": "--",
         "open_orders": "我的挂单",
         "optional": {
-            "formatter": "可选:  {restore_link} 或使用 {restore_form} 注册一个账户.",
+            "formatter": "（可选）{restore_link} 要么 {restore_link_brain}",
             "restore_form": "钱包模式",
-            "restore_link": "恢复你的账户"
+            "restore_link": "从备份中恢复您的帐户",
+            "restore_link_brain": "使用大脑密钥恢复您的帐户"
         },
         "options": {
             "memo_key": "备注公钥",
diff --git a/app/components/LoginSelector.jsx b/app/components/LoginSelector.jsx
index 726ffa2838..1437b10dcf 100644
--- a/app/components/LoginSelector.jsx
+++ b/app/components/LoginSelector.jsx
@@ -163,7 +163,7 @@ class LoginSelector extends React.Component {
                         <div className="grid-block account-login-options">
                             <Link
                                 id="account_login_button"
-                                to="/create-account/password"
+                                to="/registration"
                                 className="button primary"
                                 data-intro={translator.translate(
                                     "walkthrough.create_cloud_wallet"
@@ -172,20 +172,16 @@ class LoginSelector extends React.Component {
                                 <Translate content="header.create_account" />
                             </Link>
 
-                            <span
+                            <Link
+                                id="account_login_button"
+                                to="/login"
                                 className="button hollow primary"
-                                onClick={() => {
-                                    SettingsActions.changeSetting.defer({
-                                        setting: "passwordLogin",
-                                        value: true
-                                    });
-                                    WalletUnlockActions.unlock().catch(
-                                        () => {}
-                                    );
-                                }}
+                                data-intro={translator.translate(
+                                    "walkthrough.create_cloud_wallet"
+                                )}
                             >
                                 <Translate content="header.unlock_short" />
-                            </span>
+                            </Link>
                         </div>
 
                         <div className="additional-account-options">
@@ -205,13 +201,13 @@ class LoginSelector extends React.Component {
                                         },
                                         {
                                             type: "link",
-                                            value: "/create-account/wallet",
+                                            value: "/create-wallet-brainkey",
                                             translation:
-                                                "account.optional.restore_form",
+                                                "account.optional.restore_link_brain",
                                             dataIntro: translator.translate(
                                                 "walkthrough.create_local_wallet"
                                             ),
-                                            arg: "restore_form"
+                                            arg: "restore_link_brain"
                                         }
                                     ]}
                                 />