diff --git a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
index 3d5a865907..1c18288dbf 100644
--- a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
@@ -57,7 +57,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
         }
         if (pref instanceof EditTextPreference) {
             EditTextPreference editTextPref = (EditTextPreference) pref;
-            if (pref.getTitle().toString().toLowerCase().contains("password")) {
+            if (pref.getKey().contains("danar_password")) {
                 pref.setSummary("******");
             } else if (editTextPref.getText() != null && !editTextPref.getText().equals("")) {
                 ((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e8c6e5a0d..3d3fec1931 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -268,7 +268,6 @@
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
     <string name="danarprofile_car">Carbs absorption rate</string>
-    <string name="failedupdatebasalprofile">Failed to update basal profile</string>
     <string name="danar_history">History</string>
     <string name="danar_historyreload">Reload</string>
     <string name="uploading">Uploading</string>
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 8850ccbea4..0ebe02c9d1 100644
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -61,8 +61,8 @@
                     android:key="openapsama_current_basal_safety_multiplier" />
                 <com.andreabaccega.widget.ValidatingEditTextPreference
                     validate:testType="floatNumericRange"
-                    validate:floatminNumber="0.1"
-                    validate:floatmaxNumber="5"
+                    validate:floatminNumber="0.5"
+                    validate:floatmaxNumber="3"
                     android:digits="0123456789.,"
                     android:defaultValue="1.2"
                     android:selectAllOnFocus="true"
@@ -75,7 +75,7 @@
                 <com.andreabaccega.widget.ValidatingEditTextPreference
                     validate:testType="floatNumericRange"
                     validate:floatminNumber="0.1"
-                    validate:floatmaxNumber="5"
+                    validate:floatmaxNumber="1.0"
                     android:defaultValue="0.7"
                     android:selectAllOnFocus="true"
                     android:singleLine="true"
@@ -92,7 +92,7 @@
                 <com.andreabaccega.widget.ValidatingEditTextPreference
                     validate:testType="numericRange"
                     validate:minNumber="1"
-                    validate:maxNumber="10"
+                    validate:maxNumber="5"
                     android:digits="0123456789.,"
                     android:defaultValue="2"
                     android:selectAllOnFocus="true"
@@ -105,7 +105,7 @@
                 <com.andreabaccega.widget.ValidatingEditTextPreference
                     validate:testType="floatNumericRange"
                     validate:floatminNumber="0.1"
-                    validate:floatmaxNumber="10"
+                    validate:floatmaxNumber="5.0"
                     android:defaultValue="3.0"
                     android:selectAllOnFocus="true"
                     android:singleLine="true"