diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f6631c14ea..afe574c1ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -628,4 +628,22 @@
     <string name="careportal_pbage_label">Pump battery age</string>
     <string name="updating">Updating ...</string>
     <string name="careportal_pumpbatterychange">Pump Battery Change</string>
+    <string name="ns_alarmoptions">Alarm options</string>
+    <string name="key_nsalarm_urgent_high" translatable="false">nsalarm_urgent_high</string>
+    <string name="key_nsalarm_high" translatable="false">nsalarm_high</string>
+    <string name="key_nsalarm_low" translatable="false">nsalarm_low</string>
+    <string name="key_nsalarm_urgent_low" translatable="false">nsalarm_urgent_low</string>
+    <string name="key_nsalarm_staledata" translatable="false">nsalarm_staledata</string>
+    <string name="key_nsalarm_urgent_staledata" translatable="false">nsalarm_urgent_staledata</string>
+    <string name="key_nsalarm_staledatavalue" translatable="false">nsalarm_staledatavalue</string>
+    <string name="key_nsalarm_urgent_staledatavalue" translatable="false">nsalarm_urgent_staledatavalue</string>
+    <string name="nsalarm_urgenthigh">Urgent high</string>
+    <string name="nsalarm_high">High</string>
+    <string name="nsalarm_low">Low</string>
+    <string name="nsalarm_urgentlow">Urgent low</string>
+    <string name="nsalarm_summary" formatted="false">Currently set to %f</string>
+    <string name="nsalarm_staledata">Stale data</string>
+    <string name="nsalarm_urgentstaledata">Urgent stale data</string>
+    <string name="nsalarm_staledatavalue_label">Stale data threshold [min]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Urgent stale data threshold [min]</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b877764f3a..08a3afa0b8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,4 +28,5 @@
         <item name="android:textSize">10sp</item>
     </style>
 
+    <!-- Preferences -->
 </resources>
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index 134bd9ca91..8c12efd5de 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -6,25 +6,87 @@
         android:title="@string/nsclientinternal_title">
 
         <com.andreabaccega.widget.ValidatingEditTextPreference
-            validate:testType="webUrl"
             android:defaultValue="https://{YOUR-SITE}.azurewebsites.net/"
-            android:selectAllOnFocus="true"
-            android:inputType="textUri"
-            android:title="@string/nsclientinternal_url_title"
             android:dialogMessage="@string/nsclientinternal_url_dialogmessage"
-            android:key="@string/key_nsclientinternal_url" />
+            android:inputType="textUri"
+            android:key="@string/key_nsclientinternal_url"
+            android:selectAllOnFocus="true"
+            android:title="@string/nsclientinternal_url_title"
+            validate:testType="webUrl" />
+
         <EditTextPreference
-            android:title="@string/nsclientinternal_secret_title"
-            android:key="@string/key_nsclientinternal_api_secret"
-            android:dialogTitle="@string/nsclientinternal_secret_dialogtitle"
-            android:dialogMessage="@string/nsclientinternal_secret_dialogmessage"
             android:defaultValue=""
-            android:inputType="textPassword">
-        </EditTextPreference>
+            android:dialogMessage="@string/nsclientinternal_secret_dialogmessage"
+            android:dialogTitle="@string/nsclientinternal_secret_dialogtitle"
+            android:inputType="textPassword"
+            android:key="@string/key_nsclientinternal_api_secret"
+            android:title="@string/nsclientinternal_secret_title" />
+
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/key_ns_logappstartedevent"
             android:title="@string/ns_logappstartedevent" />
+
+        <PreferenceScreen android:title="@string/ns_alarmoptions">
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_nsalarm_urgent_high"
+                android:title="@string/nsalarm_urgenthigh"/>
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_nsalarm_high"
+                android:title="@string/nsalarm_high"/>
+
+           <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_nsalarm_low"
+                android:title="@string/nsalarm_low"/>
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_nsalarm_urgent_low"
+                android:title="@string/nsalarm_urgentlow"/>
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_nsalarm_staledata"
+                android:title="@string/nsalarm_staledata"/>
+
+            <com.andreabaccega.widget.ValidatingEditTextPreference
+                validate:testType="numericRange"
+                validate:minNumber="15"
+                validate:maxNumber="120"
+                android:digits="0123456789"
+                android:defaultValue="16"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
+                android:inputType="number"
+                android:maxLines="20"
+                android:title="@string/nsalarm_staledatavalue_label"
+                android:key="@string/key_nsalarm_staledatavalue" />
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_nsalarm_urgent_staledata"
+                android:title="@string/nsalarm_urgentstaledata"/>
+
+            <com.andreabaccega.widget.ValidatingEditTextPreference
+                validate:testType="numericRange"
+                validate:minNumber="30"
+                validate:maxNumber="180"
+                android:digits="0123456789"
+                android:defaultValue="31"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
+                android:inputType="number"
+                android:maxLines="20"
+                android:title="@string/nsalarm_urgent_staledatavalue_label"
+                android:key="@string/key_nsalarm_urgent_staledatavalue" />
+
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file