diff --git a/Greenshot/Forms/SettingsForm.Designer.cs b/Greenshot/Forms/SettingsForm.Designer.cs
index 254209fb4..c07019503 100644
--- a/Greenshot/Forms/SettingsForm.Designer.cs
+++ b/Greenshot/Forms/SettingsForm.Designer.cs
@@ -506,6 +506,8 @@ namespace Greenshot {
 			this.numericUpDown_daysbetweencheck.Size = new System.Drawing.Size(57, 20);
 			this.numericUpDown_daysbetweencheck.TabIndex = 8;
 			this.numericUpDown_daysbetweencheck.ThousandsSeparator = true;
+			this.numericUpDown_daysbetweencheck.Minimum = 0;
+			this.numericUpDown_daysbetweencheck.Maximum = 365;
 			// 
 			// label_checkperiod
 			// 
diff --git a/Greenshot/Forms/SettingsForm.cs b/Greenshot/Forms/SettingsForm.cs
index 126a13b57..6f5b65eca 100644
--- a/Greenshot/Forms/SettingsForm.cs
+++ b/Greenshot/Forms/SettingsForm.cs
@@ -46,6 +46,7 @@ namespace Greenshot {
 		private static readonly ILog Log = LogManager.GetLogger(typeof(SettingsForm));
 		private readonly ToolTip _toolTip = new ToolTip();
 		private bool _inHotkey;
+		private int _daysbetweencheckPreviousValue;
 
 		public SettingsForm() {
 			InitializeComponent();
@@ -71,7 +72,10 @@ namespace Greenshot {
 			ie_hotkeyControl.Leave += LeaveHotkeyControl;
 			lastregion_hotkeyControl.Enter += EnterHotkeyControl;
 			lastregion_hotkeyControl.Leave += LeaveHotkeyControl;
+			// Changes for BUG-2077
+			numericUpDown_daysbetweencheck.ValueChanged += NumericUpDownDaysbetweencheckOnValueChanged;
 
+			_daysbetweencheckPreviousValue = (int) numericUpDown_daysbetweencheck.Value;
 			DisplayPluginTab();
 			UpdateUi();
 			ExpertSettingsEnableState(false);
@@ -79,6 +83,38 @@ namespace Greenshot {
 			CheckSettings();
 		}
 
+		/// <summary>
+		/// This makes sure the check cannot be set to 1-6
+		/// </summary>
+		/// <param name="sender">object</param>
+		/// <param name="eventArgs">EventArgs</param>
+		private void NumericUpDownDaysbetweencheckOnValueChanged(object sender, EventArgs eventArgs)
+		{
+			int currentValue = (int)numericUpDown_daysbetweencheck.Value;
+
+			// Check if we can into the forbidden range
+			if (currentValue > 0 && currentValue < 7)
+			{
+				if (_daysbetweencheckPreviousValue <= currentValue)
+				{
+					numericUpDown_daysbetweencheck.Value = 7;
+				}
+				else
+				{
+					numericUpDown_daysbetweencheck.Value = 0;
+				}
+			}
+			if ((int)numericUpDown_daysbetweencheck.Value < 0)
+			{
+				numericUpDown_daysbetweencheck.Value = 0;
+			}
+			if ((int)numericUpDown_daysbetweencheck.Value > 365)
+			{
+				numericUpDown_daysbetweencheck.Value = 365;
+			}
+			_daysbetweencheckPreviousValue = (int)numericUpDown_daysbetweencheck.Value;
+		}
+
 		private void EnterHotkeyControl(object sender, EventArgs e) {
 			HotkeyControl.UnregisterHotkeys();
 			_inHotkey = true;
diff --git a/Greenshot/releases/additional_files/readme.txt.template b/Greenshot/releases/additional_files/readme.txt.template
index b8f3ce43b..102467d71 100644
--- a/Greenshot/releases/additional_files/readme.txt.template
+++ b/Greenshot/releases/additional_files/readme.txt.template
@@ -9,17 +9,23 @@ All details to our tickets can be found here: https://greenshot.atlassian.net
 
 @DETAILVERSION@
 
-* BUG-2065 Overflow Error
+This is a bugfix release for the Greenshot 1.2.9.104-3721c10 RELEASE
+
+Bugs fixed:
+* BUG-2065 OverflowException in the editor
+* BUG-2077 It's not possible to disable the update check
 * BUG-2080 Exception when opening the context menu
 * BUG-2089 Greenshot crashes when hotkey registration fails and OneDrive is not installed
 * BUG-2091 Greenshot .zip version has wrong log configuration
-* FEATURE-992 Open Greenshot in foreground
-* FEATURE-995 Setting to paste new images inside greenshot based on cursor location
-* FEATURE-998 Open Last Capture File should select/jump to the file
-* FEATURE-1000 Active OK-button in Greenshot quality
 
-Added or changed translation:
-* Nederlands by Stephan Paternotte
+Features added:
+* FEATURE-992 When reusing the editor, it is not brought to the front
+* FEATURE-995 Paste images inside Greenshot editor to the current cursor location
+* FEATURE-998 Opening last capture in explorer should select/jump to the file
+* FEATURE-1000 Set default focus on the OK-button in the Greenshot quality dialog
+
+Translations modified:
+Nederlands by Stephan Paternotte
 
 
 1.2.9.104-3721c10 RELEASE
diff --git a/GreenshotImgurPlugin/packages.config b/GreenshotImgurPlugin/packages.config
new file mode 100644
index 000000000..6003a80e6
--- /dev/null
+++ b/GreenshotImgurPlugin/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="LinqBridge" version="1.3.0" targetFramework="net20" />
+</packages>
\ No newline at end of file
diff --git a/GreenshotPlugin/Core/CoreConfiguration.cs b/GreenshotPlugin/Core/CoreConfiguration.cs
index 54c146773..c5e1a190f 100644
--- a/GreenshotPlugin/Core/CoreConfiguration.cs
+++ b/GreenshotPlugin/Core/CoreConfiguration.cs
@@ -431,9 +431,13 @@ namespace GreenshotPlugin.Core {
 			{
 				UpdateCheckInterval = 14;
 			}
+			if (UpdateCheckInterval > 365)
+			{
+				UpdateCheckInterval = 365;
+			}
 
 			// Enable OneNote if upgrading from 1.1
-			if(ExcludeDestinations != null && ExcludeDestinations.Contains("OneNote")) {
+			if (ExcludeDestinations != null && ExcludeDestinations.Contains("OneNote")) {
 				if(LastSaveWithVersion != null && LastSaveWithVersion.StartsWith("1.1")) {
 					ExcludeDestinations.Remove("OneNote");
 				} else {