diff --git a/build-all.bat b/build-all.bat
index a3b039cf..f695b322 100644
--- a/build-all.bat
+++ b/build-all.bat
@@ -6,8 +6,8 @@ SET "PATH=%PATH%;%PROGRAMFILES%\Git\bin;C:\apache-ant-1.9.9-bin;C:\Program Files
 
 For /F %%g in ('git rev-parse HEAD ^| cut -b 1-7') Do (Set GIT_COMMIT_HASH=%%g)
 
-set BASE_VER=11.5.0
-set BASE_VER_UDERSCORE=11_5_0
+set BASE_VER=11.5.1
+set BASE_VER_UDERSCORE=11_5_1
 For /F %%i in ('git rev-list HEAD ^| find /c /v ""') Do Set GIT_COMMIT_CNT=%%i
 
 
diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/AlertConfigurationForm.vb b/eXperDB_Monitoring_Client/iDast.MonPostgres/AlertConfigurationForm.vb
index 7850093e..26e83ad2 100644
--- a/eXperDB_Monitoring_Client/iDast.MonPostgres/AlertConfigurationForm.vb
+++ b/eXperDB_Monitoring_Client/iDast.MonPostgres/AlertConfigurationForm.vb
@@ -238,7 +238,7 @@
                     cbxHAStatus.Checked = Check
                     If retentionTime > 0 Then
                         Dim alertCondition As Integer = retentionTime / _hchkPeriod
-                        cmbHAStatus.SelectedIndex = IIf(alertCondition > 0 AndAlso alertCondition < 4, alertCondition, 1)
+                        cmbHAStatus.SelectedIndex = IIf(alertCondition > 0 AndAlso alertCondition < 4, alertCondition, 0)
                     Else
                         cmbHAStatus.SelectedIndex = 0
                     End If
@@ -246,7 +246,7 @@
                     cbxReplSlot.Checked = Check
                     If retentionTime > 0 Then
                         Dim alertCondition As Integer = retentionTime / _hchkPeriod
-                        cmbReplSlot.SelectedIndex = IIf(alertCondition > 0 AndAlso alertCondition < 4, alertCondition, 1)
+                        cmbReplSlot.SelectedIndex = IIf(alertCondition > 0 AndAlso alertCondition < 4, alertCondition, 0)
                     Else
                         cmbReplSlot.SelectedIndex = 0
                     End If
@@ -254,7 +254,7 @@
                     cbxVirtualIP.Checked = Check
                     If retentionTime > 0 Then
                         Dim alertCondition As Integer = retentionTime / _hchkPeriod
-                        cmbVIP.SelectedIndex = IIf(alertCondition > 0 AndAlso alertCondition < 4, alertCondition, 1)
+                        cmbVIP.SelectedIndex = IIf(alertCondition > 0 AndAlso alertCondition < 4, alertCondition, 0)
                     Else
                         cmbVIP.SelectedIndex = 0
                     End If