diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index e727515e5..8347b2ed1 100644
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut 
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("9.19.0.0")]
-[assembly: AssemblyFileVersion("9.19.0.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("9.20.0.0")]
+[assembly: AssemblyFileVersion("9.20.0.0")]
\ No newline at end of file
diff --git a/Project/Source/Forms/Config/PreferencesForm.Initialize.cs b/Project/Source/Forms/Config/PreferencesForm.Initialize.cs
index c437d5493..6f113c7fc 100644
--- a/Project/Source/Forms/Config/PreferencesForm.Initialize.cs
+++ b/Project/Source/Forms/Config/PreferencesForm.Initialize.cs
@@ -82,6 +82,13 @@ private void CheckFirstLaunchNoticesAndChoices()
       MainForm.Instance.ActionShowCelebrationsNotice_Click(null, null);
       // TODO update query when sod will be ready
       Settings.TorahEventsCountAsMoon = DisplayManager.QueryYesNo(AppTranslations.AskToUseMoonOmer.GetLang());
+      if ( Settings.UseSodHaibour )
+        SelectUseSodHaibour.Checked = true;
+      else
+      if ( Settings.TorahEventsCountAsMoon )
+        SelectOmerMoon.Checked = true;
+      else
+        SelectOmerSun.Checked = true;
       MainForm.Instance.ActionShowShabatNotice_Click(null, null);
       if ( DisplayManager.QueryYesNo(AppTranslations.AskToSetupPersonalShabat.GetLang()) )
         ActionUsePersonalShabat_LinkClicked(null, null);
diff --git a/README.md b/README.md
index 148264484..9adae40ed 100644
--- a/README.md
+++ b/README.md
@@ -354,6 +354,10 @@ The generation of parashot relating to Shabatot with the omer of the moon or the
 - Add command-line option `--lunarmonths` to show the lunar months board.
 - Add option to indicate parashah and Torah reference in upper or sentence case.
 
+#### 2021.12.24 - Version 9.20
+
+- Fix selecting sun omer in preferences form on first launch.
+
 #### 2021.12.23 - Version 9.19
 
 - Improve preferences form.
diff --git a/Setup/OrdisoftwareHebrewCalendarSetup.iss b/Setup/OrdisoftwareHebrewCalendarSetup.iss
index 887fa0aee..1dbe3c0e3 100644
--- a/Setup/OrdisoftwareHebrewCalendarSetup.iss
+++ b/Setup/OrdisoftwareHebrewCalendarSetup.iss
@@ -1,4 +1,4 @@
-#define MyAppVersion "9.19"
+#define MyAppVersion "9.20"
 #define MyAppName "Hebrew Calendar"
 #define MyAppNameNoSpace "HebrewCalendar"
 #define MyAppExeName "Ordisoftware.Hebrew.Calendar.exe"