diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java
index 8012fe76291d03b3326817ddc003fb90a566dfe1..0ddf8ffcc560c10c28e41980e9e33ed3a51a9ae8 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java
@@ -55,6 +55,7 @@ public class BaseSetupFragment extends Fragment {
         super.onDetach();
         setupActivityCallback.removeOnPageChangeCallback(viewPagerCallback);
         setupActivityCallback = null;
+        callFragmentSelected = false;
     }
 
     public void onFragmentSelected() {
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java
index cabde4052e583014b55f62722c1d5c1eb0a8e2eb..ba3ff4aa9590ef873026da6b33ce96c2858eb9bf 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java
@@ -116,7 +116,7 @@ public class ProviderSelectionFragment extends BaseSetupFragment implements Canc
     @Override
     public void onFragmentSelected() {
         super.onFragmentSelected();
-        setupActivityCallback.setCancelButtonHidden(!ProviderObservable.getInstance().getCurrentProvider().isConfigured());
+        setupActivityCallback.setCancelButtonHidden(true);
         setupActivityCallback.setNavigationButtonHidden(false);
     }