diff --git a/res/layout/setup_e_account_manager.xml b/res/layout/setup_e_account_manager.xml
index 1a61d6ee01df9dd80a00857eb877ef275d6119c8..f1d553150740309539d807cb5cf8fc15e7c68656 100644
--- a/res/layout/setup_e_account_manager.xml
+++ b/res/layout/setup_e_account_manager.xml
@@ -56,12 +56,29 @@
                     android:paddingRight="@dimen/location_text_margin_right"
                     android:gravity="center"
                     android:textSize="16sp"
+                    android:layout_marginBottom="@dimen/summary_margin_bottom"
                     android:textAllCaps="true"
                     android:textColor="@color/white"
                     android:background="@color/accent"
                     android:maxLines="1"
                     android:ellipsize="end"
                     android:text="@string/e_account_manager_setup_configure"/>
+
+                <Button
+                    android:id="@+id/create_account"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:gravity="center"
+                    android:textSize="16sp"
+                    android:textAllCaps="true"
+                    android:textColor="@color/white"
+                    android:background="@color/accent"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:text="@string/create_account"/>
+
             </LinearLayout>
         </ScrollView>
     </FrameLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 086ceee6c46edcc0d9fe7c8b86e0214877b186aa..730fed86166b8dba21e4b92fd334e967ffdae1dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -106,6 +106,7 @@
     <string name="e_account_manager_setup_title">Sync your cloud account</string>
     <string name="e_account_manager_setup_summary">Log in with your e.email or murena.io ID to connect your personal account with this phone. This will enable to synchronize your emails, contacts, calendar events, pictures, videos, notes and tasks across this phone and your personal cloud.</string>
     <string name="e_account_manager_setup_configure">Log in</string>
+    <string name="create_account">Create Account</string>
 
     <!-- Backup Restore -->
     <string name="intro_restore_title">Restore apps and data</string>
diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
index e4424734ecee46782079d57408acb118c03c2c97..1dee53378e11c575ade198b85741d4b14579c69b 100644
--- a/src/org/lineageos/setupwizard/EAccountManagerActivity.java
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -40,6 +40,21 @@ public class EAccountManagerActivity extends SubBaseActivity {
                 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);
+                startSubactivity(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
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index 5b327208bea21d1eee19b7a41311e674e83e0409..3bfaa2d25b350e0ea20e6ab5b6bd573afa0ab5e5 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -44,6 +44,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_FIRST_RUN = "firstRun";
@@ -73,6 +74,7 @@ public class SetupWizardApp extends Application {
     public static final int REQUEST_CODE_SETUP_BIOMETRIC = 7;
     public static final int REQUEST_CODE_SETUP_LOCKSCREEN = 9;
     public static final int REQUEST_CODE_RESTORE = 10;
+    public static final int REQUEST_CODE_CREATE_E_ACCOUNT = 1;
 
     public static final int RADIO_READY_TIMEOUT = 10 * 1000;