diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/SetupViewPagerAdapter.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/SetupViewPagerAdapter.java
index fb190dc24f31bcd387152db5fec4711359d55a89..4f7f2957341d65790c2c98495945d9bc8a299b6b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/SetupViewPagerAdapter.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/SetupViewPagerAdapter.java
@@ -38,7 +38,6 @@ public class SetupViewPagerAdapter extends FragmentStateAdapter {
                 fragments.add(PROVIDER_SELECTION_FRAGMENT);
             }
             fragments.add(CIRCUMVENTION_SETUP_FRAGMENT);
-            fragments.add(CONFIGURE_PROVIDER_FRAGMENT);
         }
 
         if (vpnPermissionRequest != null) {
@@ -49,6 +48,9 @@ public class SetupViewPagerAdapter extends FragmentStateAdapter {
             fragments.add(NOTIFICATION_PERMISSON_EDUCATIONAL_FRAGMENT);
             fragments.add(NOTIFICATION_PERMISSON_FRAGMENT);
         }
+        if (providerSetup) {
+            fragments.add(CONFIGURE_PROVIDER_FRAGMENT);
+        }
         fragments.add(SUCCESS_FRAGMENT);
         setupFragmentFactory = new SetupFragmentFactory(fragments, vpnPermissionRequest);
     }
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/SetupFragmentFactory.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/SetupFragmentFactory.java
index eaf3fbfa34fd1f18e65d6239aeaf7b4a90d8aa99..5cf15e7c072fa9c20d74adcf51a04c4608bc327a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/SetupFragmentFactory.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/SetupFragmentFactory.java
@@ -11,11 +11,11 @@ import java.util.ArrayList;
 public class SetupFragmentFactory {
     public static final int PROVIDER_SELECTION_FRAGMENT = 0;
     public static final int CIRCUMVENTION_SETUP_FRAGMENT = 1;
-    public static final int CONFIGURE_PROVIDER_FRAGMENT = 2;
-    public static final int VPN_PERMISSON_EDUCATIONAL_FRAGMENT = 3;
-    public static final int VPN_PERMISSON_FRAGMENT = 4;
-    public static final int NOTIFICATION_PERMISSON_EDUCATIONAL_FRAGMENT = 5;
-    public static final int NOTIFICATION_PERMISSON_FRAGMENT = 6;
+    public static final int VPN_PERMISSON_EDUCATIONAL_FRAGMENT = 2;
+    public static final int VPN_PERMISSON_FRAGMENT = 3;
+    public static final int NOTIFICATION_PERMISSON_EDUCATIONAL_FRAGMENT = 4;
+    public static final int NOTIFICATION_PERMISSON_FRAGMENT = 5;
+    public static final int CONFIGURE_PROVIDER_FRAGMENT = 6;
 
     public static final int SUCCESS_FRAGMENT = 7;