diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
index 0ba3cbad97..b39f2209b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
@@ -75,8 +75,10 @@ public class SWDefinition {
     }
 
     SWDefinition() {
-        if (Config.APS || Config.PUMPCONTROL)
+        if (Config.APS)
             SWDefinitionFull();
+        else if (Config.PUMPCONTROL)
+            SWDefinitionPumpControl();
         else if (Config.NSCLIENT)
             SWDefinitionNSClient();
     }
@@ -456,6 +458,29 @@ public class SWDefinition {
         ;
     }
 
+    private void SWDefinitionPumpControl() {
+        // List all the screens here
+        add(screenSetupWizard)
+                .add(screenLanguage)
+                .add(screenEula)
+                .add(screenPermissionBattery)
+                .add(screenPermissionBt)
+                .add(screenPermissionStore)
+                .add(screenImport)
+                .add(screenNsClient)
+                .add(screenAge)
+                .add(screenInsulin)
+                .add(screenBgSource)
+                .add(screenProfile)
+                .add(screenNsProfile)
+                .add(screenLocalProfile)
+                .add(screenSimpleProfile)
+                .add(screenProfileSwitch)
+                .add(screenPump)
+                .add(screenSensitivity)
+        ;
+    }
+
     private void SWDefinitionNSClient() {
         // List all the screens here
         add(screenSetupWizard)