diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
index 6e4cd42f2f..2fe85a4978 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
+++ b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
@@ -42,7 +42,11 @@ public class SWDefinition {
 
     SWDefinition() {
         // List all the screens here
-        add(new SWScreen(R.string.language)
+        add(new SWScreen(R.string.nav_setupwizard)
+                .add(new SWInfotext()
+                        .label(R.string.welcometosetupwizard) )
+        )
+        .add(new SWScreen(R.string.language)
                 .skippable(false)
                 .add(new SWRadioButton()
                         .option(R.array.languagesArray, R.array.languagesValues)
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWInfotext.java b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWInfotext.java
new file mode 100644
index 0000000000..92f36e2498
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWInfotext.java
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.startupwizard;
+
+import android.content.Context;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class SWInfotext extends SWItem {
+    private static Logger log = LoggerFactory.getLogger(SWInfotext.class);
+
+    public SWInfotext() {
+        super(Type.TEXT);
+    }
+
+    @Override
+    public void generateDialog(View view, LinearLayout layout) {
+        Context context = view.getContext();
+
+        TextView l = new TextView(context);
+        l.setId(view.generateViewId());
+        l.setText(label);
+        layout.addView(l);
+
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWItem.java b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWItem.java
index 0eb6c60495..4d8dfe1bc5 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWItem.java
+++ b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWItem.java
@@ -16,6 +16,7 @@ public class SWItem {
 
     enum Type {
         NONE,
+        TEXT,
         URL,
         STRING,
         NUMBER,
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java b/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
index 3da44618ab..35c4549bd3 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
@@ -88,7 +88,7 @@ public class SetupWizardActivity extends AppCompatActivity {
 
     private void updateButtons() {
         SWScreen currentScreen = screens.get(currentWizardPage);
-        if (currentScreen.validator.isValid() || currentScreen.skippable) {
+        if (currentScreen.validator == null || currentScreen.validator.isValid() || currentScreen.skippable) {
             if (currentWizardPage == screens.size() - 1) {
                 findViewById(R.id.finish_button).setVisibility(View.VISIBLE);
                 findViewById(R.id.next_button).setVisibility(View.GONE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 60732f925f..306f23a314 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1060,5 +1060,6 @@
 
     <string name="dummy_content">DUMMY\nCONTENT</string>
     <string name="enable_nsclient">Enable NSClient</string>
+    <string name="welcometosetupwizard">Welcome to setup wizard. It will guide you through the setup process</string>
 
 </resources>