diff --git a/src/common/components/login/index.tsx b/src/common/components/login/index.tsx
index d0b49c20193..129346f7d08 100644
--- a/src/common/components/login/index.tsx
+++ b/src/common/components/login/index.tsx
@@ -600,6 +600,9 @@ export class Login extends BaseComponent<LoginProps, State> {
     const keyChainLogo = global.isElectron
       ? "./img/keychain.png"
       : require("../../img/keychain.png");
+    const hiveAuthLogo = global.isElectron
+      ? "./img/hive-auth.jpeg"
+      : require("../../img/hive-auth.jpeg");
 
     const spinner = (
       <Spinner
@@ -639,80 +642,80 @@ export class Login extends BaseComponent<LoginProps, State> {
                 })}
               </div>
             </div>
-            {/* <OrDivider /> */}
           </>
         )}
 
-        {/* <Form
-          className="login-form"
-          onSubmit={(e: React.FormEvent) => {
-            e.preventDefault();
-          }}
-        >
-          <p className="login-form-text">{_t("login.with-user-pass")}</p>
-          <Form.Group>
-            <Form.Control
-              type="text"
-              value={username}
-              onChange={this.usernameChanged}
-              placeholder={_t("login.username-placeholder")}
-              autoFocus={true}
-              onKeyDown={this.inputKeyDown}
-            />
-          </Form.Group>
-          <Form.Group>
-            <Form.Control
-              type="password"
-              value={key}
-              autoComplete="off"
-              onChange={this.keyChanged}
-              placeholder={_t("login.key-placeholder")}
-              onKeyDown={this.inputKeyDown}
-            />
-          </Form.Group>
-          <p className="login-form-text">
-            {_t("login.login-info-1")}{" "}
-            <a href="https://starterkit.tech/faqs">
-              {_t("login.login-info-2")}
-            </a>
-          </p>
-          <Button disabled={inProgress} block={true} onClick={this.login}>
-            {inProgress && username && key && spinner}
-            {_t("g.login")}
-          </Button>
-        </Form> */}
-        <OrDivider />
-        {/* <div className="hs-login">
-          <a
-            className={_c(
-              `btn btn-outline-primary ${inProgress ? "disabled" : ""}`
-            )}
-            onClick={this.hsLogin}
+        <OrDivider text={"Login options"}/>
+
+        <div>
+          <Form
+            className="login-form"
+            onSubmit={(e: React.FormEvent) => {
+              e.preventDefault();
+            }}
           >
-            <img
-              src={global.isElectron ? "./img/hive-signer.svg" : hsLogo}
-              className="hs-logo"
-              alt="hivesigner"
-            />{" "}
-            {_t("login.with-hive-signer")}
-          </a>
-        </div> */}
+            <Form.Group>
+              <Form.Control
+                type="text"
+                value={username}
+                onChange={this.usernameChanged}
+                placeholder={_t("login.username-placeholder")}
+                autoFocus={true}
+                onKeyDown={this.inputKeyDown}
+              />
+            </Form.Group>
+          </Form>
+          <div className="kc-login">
+              <a
+                className={_c(
+                  `btn btn-outline-primary ${inProgress ? "disabled" : ""}`
+                )}
+                onClick={()=> console.log("login in with hive auth...")}
+              >
+                <img src={hiveAuthLogo} className="kc-logo" alt="keychain" />{" "}
+                {_t("login.with-hive-auth")}
+              </a>
+            </div>
+        </div>
+
+        <OrDivider text={"OR"}/>
+
         {/* {global.hasKeyChain && ( */}
         <div className="d-flex flex-column align-items-center">
           <div className="mb-3 d-flex flex-column align-items-center">
             <span>Make sure you have keychain installed!</span>
             <span className="mt-3">Don't have keychain? download <a href="https://hive-keychain.com/">here</a></span>
           </div>
-          <div className="kc-login">
-            <a
-              className={_c(
-                `btn btn-outline-primary ${inProgress ? "disabled" : ""}`
-              )}
-              onClick={this.kcLogin}
+
+          <div>
+            <Form
+              className="login-form"
+              onSubmit={(e: React.FormEvent) => {
+                e.preventDefault();
+              }}
             >
-              <img src={keyChainLogo} className="kc-logo" alt="keychain" />{" "}
-              {_t("login.with-keychain")}
-            </a>
+              <Form.Group>
+                <Form.Control
+                  type="text"
+                  value={username}
+                  onChange={this.usernameChanged}
+                  placeholder={_t("login.username-placeholder")}
+                  autoFocus={true}
+                  onKeyDown={this.inputKeyDown}
+                />
+              </Form.Group>
+            </Form>
+            <div className="kc-login">
+              <a
+                className={_c(
+                  `btn btn-outline-primary ${inProgress ? "disabled" : ""}`
+                )}
+                onClick={this.kcLogin}
+              >
+                <img src={keyChainLogo} className="kc-logo" alt="keychain" />{" "}
+                {_t("login.with-keychain")}
+              </a>
+            </div>
           </div>
         </div>
         {/* )} */}
diff --git a/src/common/components/or-divider/_index.scss b/src/common/components/or-divider/_index.scss
index 6e4cfd5fed7..007fbf16f30 100644
--- a/src/common/components/or-divider/_index.scss
+++ b/src/common/components/or-divider/_index.scss
@@ -11,7 +11,7 @@
 .or-divider::before,
 .or-divider::after {
   position: absolute;
-  width: 130px;
+  width: 80px;
   height: 1px;
   top: 24px;
   background-color: $white-four;
diff --git a/src/common/components/or-divider/index.tsx b/src/common/components/or-divider/index.tsx
index 472f85b2a33..6be0dfa9e86 100644
--- a/src/common/components/or-divider/index.tsx
+++ b/src/common/components/or-divider/index.tsx
@@ -1,13 +1,17 @@
-import React, {Component} from "react";
-import {_t} from "../../i18n";
+import React, { Component } from "react";
 
-export default class OrDivider extends Component {
+interface OrDividerProps {
+    text: string;
+}
+
+class OrDivider extends Component<OrDividerProps> {
     render() {
+        const { text } = this.props;
 
         return (
-            <>
-                <div className="or-divider">{_t("g.or")}</div>
-            </>
+            <div className="or-divider">{text}</div>
         );
     }
 }
+
+export default OrDivider;
diff --git a/src/common/i18n/locales/en-US.json b/src/common/i18n/locales/en-US.json
index 85f801b32b7..48f14255e3c 100644
--- a/src/common/i18n/locales/en-US.json
+++ b/src/common/i18n/locales/en-US.json
@@ -154,6 +154,7 @@
     "error-authenticate": "Wrong private key. Master or active or posting private key required.",
     "with-hive-signer": "Login with hivesigner",
     "with-keychain": "Login with keychain",
+    "with-hive-auth": "Login with HiveAuth",
     "sign-up-text-1": "Don't have an account?",
     "sign-up-text-2": "Sign up now!"
   },
diff --git a/src/common/img/hive-auth.jpeg b/src/common/img/hive-auth.jpeg
new file mode 100644
index 00000000000..a242fcfbece
Binary files /dev/null and b/src/common/img/hive-auth.jpeg differ