diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
index e4424734ecee46782079d57408acb118c03c2c97..ccb9537021710702174726320a39c9d39f0b7af0 100644
--- a/src/org/lineageos/setupwizard/EAccountManagerActivity.java
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -25,6 +25,8 @@ import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
 import android.os.Bundle;
 
+import static org.lineageos.setupwizard.SetupWizardApp.*;
+
 public class EAccountManagerActivity extends SubBaseActivity {
 
     public static final String TAG = EAccountManagerActivity.class.getSimpleName();
@@ -69,7 +71,13 @@ public class EAccountManagerActivity extends SubBaseActivity {
                 @Override
                 public void run(AccountManagerFuture<Bundle> future) {
                     // An eelo account has been added, continue to the next screen
-                    onNavigateNext();
+                    Account[] accounts = accountManager.getAccountsByType("e.foundation.webdav.eelo");
+                    if (accounts.length > 0) {
+                        launchRestore();
+                    } else {
+                        onNavigateNext();
+                    }
+
                 }
             }, null);
         } 
@@ -81,4 +89,9 @@ public class EAccountManagerActivity extends SubBaseActivity {
     protected int getSubactivityNextTransition() {
         return TRANSITION_ID_SLIDE;
     }
+
+    private void launchRestore() {
+        Intent intent = new Intent(ACTION_RESTORE_FROM_BACKUP);
+        startSubactivity(intent, REQUEST_CODE_RESTORE);
+    }
 }
\ No newline at end of file
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index 1a9318dae7c1d75e23dcbcba9e14fd971a209a20..dcf412280f59359b20220f1c2f1052e5978ae486 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -42,6 +42,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_RESTORE_FROM_BACKUP = "foundation.e.backup.RESTORE_BACKUP";
 
 
     public static final String EXTRA_FIRST_RUN = "firstRun";
@@ -70,6 +71,7 @@ public class SetupWizardApp extends Application {
     public static final int REQUEST_CODE_SETUP_BLUETOOTH= 5;
     public static final int REQUEST_CODE_SETUP_FINGERPRINT = 7;
     public static final int REQUEST_CODE_SETUP_LOCKSCREEN = 9;
+    public static final int REQUEST_CODE_RESTORE = 10;
 
     public static final int RADIO_READY_TIMEOUT = 10 * 1000;