diff --git a/src/components/EmailEnterPage/index.tsx b/src/components/EmailEnterPage/index.tsx
index adb7488..b3f57bb 100755
--- a/src/components/EmailEnterPage/index.tsx
+++ b/src/components/EmailEnterPage/index.tsx
@@ -118,12 +118,6 @@ function EmailEnterPage({
         Enter your email
       </Title>
       <p className={styles["not-share"]}>{t("we_dont_share")}</p>
-      <NameInput
-        value={name}
-        placeholder="Your name"
-        onValid={handleValidName}
-        onInvalid={() => setIsValidName(!isRequiredName)}
-      />
       <EmailInput
         name="email"
         value={email}
@@ -131,6 +125,12 @@ function EmailEnterPage({
         onValid={handleValidEmail}
         onInvalid={() => setIsValidEmail(false)}
       />
+      <NameInput
+          value={name}
+          placeholder="Your name"
+          onValid={handleValidName}
+          onInvalid={() => setIsValidName(!isRequiredName)}
+      />
       <Policy sizing="medium" className={styles.policy}>
         {t("_continue_agree", {
           eulaLink: (
diff --git a/src/components/pages/ABDesign/v1/pages/EmailEnterPage/index.tsx b/src/components/pages/ABDesign/v1/pages/EmailEnterPage/index.tsx
index 6f4a44c..106c13b 100644
--- a/src/components/pages/ABDesign/v1/pages/EmailEnterPage/index.tsx
+++ b/src/components/pages/ABDesign/v1/pages/EmailEnterPage/index.tsx
@@ -133,19 +133,19 @@ function EmailEnterPage({
         Enter your email
       </Title>
       <p className={styles["not-share"]}>{t("we_dont_share")}</p>
+      <EmailInput
+          name="email"
+          value={email}
+          placeholder={t("your_email")}
+          onValid={handleValidEmail}
+          onInvalid={() => setIsValidEmail(false)}
+      />
       <NameInput
         value={name}
         placeholder="Your name"
         onValid={handleValidName}
         onInvalid={() => setIsValidName(!isRequiredName)}
       />
-      <EmailInput
-        name="email"
-        value={email}
-        placeholder={t("your_email")}
-        onValid={handleValidEmail}
-        onInvalid={() => setIsValidEmail(false)}
-      />
       <QuestionnaireGreenButton
         className={styles.button}
         onClick={handleClick}
diff --git a/src/locales/dev.ts b/src/locales/dev.ts
index 48ca5ee..9ee8f92 100755
--- a/src/locales/dev.ts
+++ b/src/locales/dev.ts
@@ -4,7 +4,7 @@ export default {
     next: "Next",
     date_of_birth: "What's your date of birth?",
     privacy_text: "By continuing, you agree to our <eulaLink> and <privacyLink>. Have a question? Reach our support team <clickHere>",
-    eula: "Hint's EULA",
+    eula: "EULA",
     here: 'here',
     privacy_notice: 'Privacy Notice',
     born_time_question: "What time were you born?",