diff --git a/zaaReloaded2/Properties/Settings.Designer.cs b/zaaReloaded2/Properties/Settings.Designer.cs
index 82402a5..53fccbd 100755
--- a/zaaReloaded2/Properties/Settings.Designer.cs
+++ b/zaaReloaded2/Properties/Settings.Designer.cs
@@ -264,5 +264,17 @@ namespace zaaReloaded2.Properties {
                 return ((string)(this["Repository"]));
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool NeedUpgrade {
+            get {
+                return ((bool)(this["NeedUpgrade"]));
+            }
+            set {
+                this["NeedUpgrade"] = value;
+            }
+        }
     }
 }
diff --git a/zaaReloaded2/Properties/Settings.settings b/zaaReloaded2/Properties/Settings.settings
index c4bb743..d448e89 100755
--- a/zaaReloaded2/Properties/Settings.settings
+++ b/zaaReloaded2/Properties/Settings.settings
@@ -77,5 +77,8 @@
     <Setting Name="Repository" Type="System.String" Scope="Application">
       <Value Profile="(Default)">http://git.bovender.de</Value>
     </Setting>
+    <Setting Name="NeedUpgrade" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs
index a8d5779..d901dfc 100755
--- a/zaaReloaded2/ThisAddIn.cs
+++ b/zaaReloaded2/ThisAddIn.cs
@@ -46,7 +46,14 @@ namespace zaaReloaded2
         {
             Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
             Bovender.WpfHelpers.RegisterTextBoxSelectAll();
-            Properties.Settings.Default.Upgrade();
+
+            if (Properties.Settings.Default.NeedUpgrade)
+            {
+                Properties.Settings.Default.Upgrade();
+                Properties.Settings.Default.NeedUpgrade = false;
+                Properties.Settings.Default.Save();
+            }
+
             CheckForUpdates();
             _oldCaption = Globals.ThisAddIn.Application.Caption;
             Globals.ThisAddIn.Application.Caption = 
diff --git a/zaaReloaded2/app.config b/zaaReloaded2/app.config
index edf22de..4bf87af 100755
--- a/zaaReloaded2/app.config
+++ b/zaaReloaded2/app.config
@@ -108,6 +108,9 @@
             <setting name="FirstRunWizardShown" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="NeedUpgrade" serializeAs="String">
+                <value>True</value>
+            </setting>
         </zaaReloaded2.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file