diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 260e2c5135..f5ab617946 100644
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -5,22 +5,6 @@
         android:key="advanced"
         android:title="@string/advancedsettings_title">
         <PreferenceScreen android:title="@string/advancedsettings_title">
-            <PreferenceCategory android:title="@string/nightscout">
-                <SwitchPreference
-                    android:defaultValue="false"
-                    android:key="@string/key_ns_upload_only"
-                    android:summary="@string/ns_upload_only_summary"
-                    android:title="@string/ns_upload_only" />
-                <SwitchPreference
-                    android:defaultValue="false"
-                    android:key="@string/key_ns_noupload"
-                    android:summary="@string/ns_noupload_summary"
-                    android:title="@string/ns_noupload" />
-                <SwitchPreference
-                    android:defaultValue="false"
-                    android:key="ns_sync_use_absolute"
-                    android:title="@string/ns_sync_use_absolute_title" />
-            </PreferenceCategory>
             <PreferenceCategory android:title="@string/superbolus">
                 <SwitchPreference
                     android:defaultValue="false"
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index f07251929a..d1e09a563d 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        android:title="@string/nsclientinternal_title">
+
+    <PreferenceCategory android:title="@string/nsclientinternal_title">
 
         <com.andreabaccega.widget.ValidatingEditTextPreference
             android:defaultValue="https://{YOUR-SITE}.azurewebsites.net/"
@@ -14,7 +14,6 @@
             validate:testType="webUrl" />
 
         <EditTextPreference
-            android:defaultValue=""
             android:dialogMessage="@string/nsclientinternal_secret_dialogmessage"
             android:dialogTitle="@string/nsclientinternal_secret_dialogtitle"
             android:inputType="textPassword"
@@ -105,6 +104,23 @@
                 android:summary="@string/ns_localbroadcasts"
                 android:title="@string/ns_localbroadcasts_title" />
 
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_ns_upload_only"
+                android:summary="@string/ns_upload_only_summary"
+                android:title="@string/ns_upload_only" />
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_ns_noupload"
+                android:summary="@string/ns_noupload_summary"
+                android:title="@string/ns_noupload" />
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="ns_sync_use_absolute"
+                android:title="@string/ns_sync_use_absolute_title" />
+
         </PreferenceScreen>
 
     </PreferenceCategory>