diff --git a/res/layout/setup_e_account_manager.xml b/res/layout/setup_e_account_manager.xml
index 89aba7a6f6c34f97970f5a545247485cabf947f3..e9abf98c4b895aceb6713a9721891cb1c9c01904 100644
--- a/res/layout/setup_e_account_manager.xml
+++ b/res/layout/setup_e_account_manager.xml
@@ -47,6 +47,31 @@
                         style="@style/SudItemTitle.GlifDescription"
                         android:text="@string/e_account_manager_setup_summary" />
 
+                    <Button
+                        android:id="@+id/create_account"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/create_account"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="80dp"
+                        style="@style/SudGlifButton.Primary" />
+
+                    <Button
+                        android:id="@+id/sign_in"
+                        android:text="@string/sign_in"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        style="@style/SudGlifButton.Secondary" />
+
+
+
                 </LinearLayout>
             </ScrollView>
         </FrameLayout>
@@ -55,7 +80,7 @@
             android:id="@+id/navigation_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:showSkipButton="true" />
+            app:showSkipButton="false" />
 
     </LinearLayout>
 </com.google.android.setupdesign.GlifLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eb9fa04914a9ad992206dc8166f4000d1e9352ef..d5f8f76749de34787d0b08789d4b390d8be5fe59 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,4 +122,6 @@
     <string name="update_recovery_title_e">Update Recovery</string>
     <string name="update_recovery_description_e">Updates Recovery on first boot subsequent to every update.</string>
     <string name="update_recovery_setting_e">Update Recovery alongside the OS</string>
+    <string name="create_account">Create Account</string>
+    <string name="sign_in">Sign in</string>
 </resources>
diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
index b4f33ad510d385b4b2c5893bc14e6b9b60af221f..c09c38dd258f00da62c03dd0d7c9eae941be2129 100644
--- a/src/org/lineageos/setupwizard/EAccountManagerActivity.java
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -24,6 +24,7 @@ import android.accounts.AccountManager;
 import android.content.Intent;
 import android.provider.Settings;
 import android.util.Log;
+import android.view.View;
 
 import org.lineageos.setupwizard.util.SetupWizardUtils;
 
@@ -33,8 +34,28 @@ public class EAccountManagerActivity extends SubBaseActivity {
 
     @Override
     protected void onStartSubactivity() {
-        setNextText(R.string.e_account_manager_setup_configure);
         setNextAllowed(true);
+        findViewById(R.id.sign_in).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                launchAccountManagerSetup();
+            }
+        });
+        findViewById(R.id.create_account).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(SetupWizardApp.ACTION_CREATE_E_ACCOUNT);
+                startActivityForResult(intent, SetupWizardApp.REQUEST_CODE_CREATE_E_ACCOUNT);
+            }
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(resultCode == RESULT_OK) {
+            onNavigateNext();
+        }
     }
 
     @Override
@@ -48,11 +69,6 @@ public class EAccountManagerActivity extends SubBaseActivity {
         }
     }
 
-    @Override
-    protected void onNextPressed() {
-        launchAccountManagerSetup();
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.setup_e_account_manager;
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index bc4e50d32e1492b3aa1dd3511cde9cebc7db6fda..acab7cf554f82c6d979665a17bdab0ba61cd2fd0 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -46,6 +46,7 @@ public class SetupWizardApp extends Application {
     public static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
     public static final String ACTION_NEXT = "com.android.wizard.NEXT";
     public static final String ACTION_LOAD = "com.android.wizard.LOAD";
+    public static final String ACTION_CREATE_E_ACCOUNT = "foundation.e.accountmanager.ui.setup.CreateAccountActivity";
 
     public static final String EXTRA_HAS_MULTIPLE_USERS = "hasMultipleUsers";
     public static final String EXTRA_TITLE = "title";
@@ -74,6 +75,7 @@ public class SetupWizardApp extends Application {
     public static final int REQUEST_CODE_SETUP_LOCKSCREEN = 9;
     public static final int REQUEST_CODE_RESTORE = 10;
     public static final int REQUEST_CODE_SETUP_ACCOUNT_TYPE_E = 11;
+    public static final int REQUEST_CODE_CREATE_E_ACCOUNT = 1;
 
     public static final int RADIO_READY_TIMEOUT = 10 * 1000;