diff --git a/TGControlPanel/App.config b/TGControlPanel/App.config
index 3fec51bad2..ddc58262f2 100644
--- a/TGControlPanel/App.config
+++ b/TGControlPanel/App.config
@@ -20,6 +20,9 @@
             <setting name="LastConfigPageIndex" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="UpgradeRequired" serializeAs="String">
+                <value>True</value>
+            </setting>
         </TGControlPanel.Properties.Settings>
         <TGControlPanel.Properties.Settings1>
             <setting name="LastPageIndex" serializeAs="String">
diff --git a/TGControlPanel/Program.cs b/TGControlPanel/Program.cs
index 4b49fa8113..6fc61dc39d 100644
--- a/TGControlPanel/Program.cs
+++ b/TGControlPanel/Program.cs
@@ -12,6 +12,12 @@ namespace TGControlPanel
 		{
 			try
 			{
+				if (Properties.Settings.Default.UpgradeRequired)
+				{
+					Properties.Settings.Default.Upgrade();
+					Properties.Settings.Default.UpgradeRequired = false;
+					Properties.Settings.Default.Save();
+				}
 				var res = Server.VerifyConnection();
 				if (res != null)
 				{
diff --git a/TGControlPanel/Properties/Settings.Designer.cs b/TGControlPanel/Properties/Settings.Designer.cs
index c5a46a486f..c3ad294d5e 100644
--- a/TGControlPanel/Properties/Settings.Designer.cs
+++ b/TGControlPanel/Properties/Settings.Designer.cs
@@ -46,5 +46,17 @@ namespace TGControlPanel.Properties {
                 this["LastConfigPageIndex"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool UpgradeRequired {
+            get {
+                return ((bool)(this["UpgradeRequired"]));
+            }
+            set {
+                this["UpgradeRequired"] = value;
+            }
+        }
     }
 }
diff --git a/TGControlPanel/Properties/Settings.settings b/TGControlPanel/Properties/Settings.settings
index 36129940b3..ab8a13022f 100644
--- a/TGControlPanel/Properties/Settings.settings
+++ b/TGControlPanel/Properties/Settings.settings
@@ -8,5 +8,8 @@
     <Setting Name="LastConfigPageIndex" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
+    <Setting Name="UpgradeRequired" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/TGServerService/App.config b/TGServerService/App.config
index 78c7b13335..fd31b7fb3d 100644
--- a/TGServerService/App.config
+++ b/TGServerService/App.config
@@ -71,6 +71,9 @@
             <setting name="ChatProviderEntropy" serializeAs="String">
                 <value>John Madden</value>
             </setting>
+            <setting name="UpgradeRequired" serializeAs="String">
+                <value>True</value>
+            </setting>
         </TGServerService.Properties.Settings>
     </userSettings>
   <runtime>
diff --git a/TGServerService/Properties/Settings.Designer.cs b/TGServerService/Properties/Settings.Designer.cs
index f6bca1d455..f319da928f 100644
--- a/TGServerService/Properties/Settings.Designer.cs
+++ b/TGServerService/Properties/Settings.Designer.cs
@@ -230,5 +230,17 @@ namespace TGServerService.Properties {
                 this["ChatProviderEntropy"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool UpgradeRequired {
+            get {
+                return ((bool)(this["UpgradeRequired"]));
+            }
+            set {
+                this["UpgradeRequired"] = value;
+            }
+        }
     }
 }
diff --git a/TGServerService/Properties/Settings.settings b/TGServerService/Properties/Settings.settings
index b2fd845f76..b4b48d8730 100644
--- a/TGServerService/Properties/Settings.settings
+++ b/TGServerService/Properties/Settings.settings
@@ -59,5 +59,8 @@
     <Setting Name="ChatProviderEntropy" Type="System.String" Scope="User">
       <Value Profile="(Default)">John Madden</Value>
     </Setting>
+    <Setting Name="UpgradeRequired" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/TGServerService/ServerService.cs b/TGServerService/ServerService.cs
index 66f0133c50..df2c86eb11 100644
--- a/TGServerService/ServerService.cs
+++ b/TGServerService/ServerService.cs
@@ -22,6 +22,12 @@ namespace TGServerService
 		//Use OnStart instead
 		public TGServerService()
 		{
+			if (Properties.Settings.Default.UpgradeRequired)
+			{
+				Properties.Settings.Default.Upgrade();
+				Properties.Settings.Default.UpgradeRequired = false;
+				Properties.Settings.Default.Save();
+			}
 			InitializeComponent();
 			Run(this);
 		}