diff --git a/TestBenchFramework/BenchesDlg.cs b/TestBenchFramework/BenchesDlg.cs
index 99f0a8c41..b2cc2389c 100644
--- a/TestBenchFramework/BenchesDlg.cs
+++ b/TestBenchFramework/BenchesDlg.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Windows.Forms;
@@ -175,8 +175,8 @@ namespace TBF
         /// </summary>
         private void okButton_Click(object sender, EventArgs e)
         {
-			localSettings.Save();
-			Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
+			Program.LocalSettings.TestBenches = localSettings.TestBenches;
+            Program.LocalSettings.Save();
             DialogResult = DialogResult.OK;
             Close();
             return;
diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs
index 5e3e0df87..e67c05367 100644
--- a/TestBenchFramework/Program.cs
+++ b/TestBenchFramework/Program.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;
@@ -360,7 +360,6 @@ namespace TBF
 										{
 											return;         /// Exit program
 										}
-										Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
 										if (Program.LocalSettings == null)
                                             return;         /// Fatal error -> Exit program
                                         else