diff --git a/plugins/aps/src/main/res/values/strings.xml b/plugins/aps/src/main/res/values/strings.xml
index fa718b1246..b7560597de 100644
--- a/plugins/aps/src/main/res/values/strings.xml
+++ b/plugins/aps/src/main/res/values/strings.xml
@@ -23,8 +23,8 @@
     <string name="key_DynISFAdjust" translatable="false">DynISFAdjust</string>
     <string name="key_adjust_sensitivity" translatable="false">dynisf_adjust_sensitivity</string>
 
-    <string name="dynisf_adjust_sensitivity">Adjust sensitivity and basal</string>
-    <string name="dynisf_adjust_sensitivity_summary">If activated DynISF uses the last 24h TDD/7D TDD as the basis for adjusting calculated ISF and also for increasing and decreasing basal rate, in the same way that standard Autosens does</string>
+    <string name="dynisf_adjust_sensitivity">Enable TDD based sensitivity ratio for basal and glucose target modification</string>
+    <string name="dynisf_adjust_sensitivity_summary">Uses the last 24h TDD/7D TDD to calculate sensitivity ratio used for increasing or decreasing basal rate, and also adjust glucose target if these options are enabled, in the same way Autosens does. It is recommended to start with this option turned off</string>
     <string name="DynISFAdjust_title" formatted="false">DynamicISF Adjustment Factor %</string>
     <string name="DynISFAdjust_summary" formatted="false">Adjustment factor for DynamicISF. Set more than 100% for more aggressive correction doses, and less than 100% for less aggressive corrections.</string>
     <string name="high_temptarget_raises_sensitivity_title">High temptarget raises sensitivity</string>
diff --git a/plugins/aps/src/main/res/xml/pref_openapssmbdynamicisf.xml b/plugins/aps/src/main/res/xml/pref_openapssmbdynamicisf.xml
index 6c6a192efe..3dfd281e91 100644
--- a/plugins/aps/src/main/res/xml/pref_openapssmbdynamicisf.xml
+++ b/plugins/aps/src/main/res/xml/pref_openapssmbdynamicisf.xml
@@ -55,6 +55,20 @@
             android:summary="@string/dynisf_adjust_sensitivity_summary"
             android:title="@string/dynisf_adjust_sensitivity" />
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:dependency="@string/key_adjust_sensitivity"
+            android:key="@string/key_sensitivity_raises_target"
+            android:summary="@string/sensitivity_raises_target_summary"
+            android:title="@string/sensitivity_raises_target_title" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:dependency="@string/key_adjust_sensitivity"
+            android:key="@string/key_resistance_lowers_target"
+            android:summary="@string/resistance_lowers_target_summary"
+            android:title="@string/resistance_lowers_target_title" />
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_use_smb"
@@ -141,16 +155,6 @@
             android:summary="@string/enable_uam_summary"
             android:title="@string/enable_uam" />
 
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/key_sensitivity_raises_target"
-            android:summary="@string/sensitivity_raises_target_summary"
-            android:title="@string/sensitivity_raises_target_title" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_resistance_lowers_target"
-            android:summary="@string/resistance_lowers_target_summary"
-            android:title="@string/resistance_lowers_target_title" />
         <!-- TODO AS-FIX -->
         <!--<SwitchPreference
             android:defaultValue="false"