diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0121dc19..e1834f21 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/GlobalData/GlobalDatabase.java b/src/GlobalData/GlobalDatabase.java
index e1921c7e..df909672 100644
--- a/src/GlobalData/GlobalDatabase.java
+++ b/src/GlobalData/GlobalDatabase.java
@@ -108,19 +108,24 @@ public class GlobalDatabase extends SQLiteDatabase {
     public PassCode_2021 getSynchronizePassCode() {
         return null;
     }
-    public void SaveCredentials() throws Exception {
-        Credentials credentials = (Credentials) Current.get(Current.Credentials);
-        if (Current.HasMachine())
-            credentials.machine_id = Current.getMachine().id;
-        if (Current.HasUser())
-            credentials.user_id = Current.getUser().id;
-        if (Current.HasCompiler())
-            credentials.compiler_id = Current.getCompiler().id;
-        if (Current.HasMakefile())
-            credentials.makefile_id = Current.getMakefile().id;
-        if (Current.HasRunConfiguration())
-            credentials.runconfiguration_id = Current.getRunConfiguration().id;
-        Update(credentials);
+    public void SaveCredentials(){
+        try {
+            Credentials credentials = (Credentials) Current.get(Current.Credentials);
+            if (Current.HasMachine())
+                credentials.machine_id = Current.getMachine().id;
+            if (Current.HasUser())
+                credentials.user_id = Current.getUser().id;
+            if (Current.HasCompiler())
+                credentials.compiler_id = Current.getCompiler().id;
+            if (Current.HasMakefile())
+                credentials.makefile_id = Current.getMakefile().id;
+            if (Current.HasRunConfiguration())
+                credentials.runconfiguration_id = Current.getRunConfiguration().id;
+            Update(credentials);
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+        }
     }
     public void UpdateCredentials() {
         try {
diff --git a/src/Visual_DVM_2021/UI/Main/DebugForm.java b/src/Visual_DVM_2021/UI/Main/DebugForm.java
index 9dd3d171..2f3135f6 100644
--- a/src/Visual_DVM_2021/UI/Main/DebugForm.java
+++ b/src/Visual_DVM_2021/UI/Main/DebugForm.java
@@ -37,15 +37,6 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
         return content;
     }
     @Override
-    public void SaveSplitters() {
-        FormWithSplitters.super.SaveSplitters();
-        try {
-            Global.db.SaveCredentials();
-        } catch (Exception ex) {
-            Global.Log.PrintException(ex);
-        }
-    }
-    @Override
     public void DropRunTasksComparison() {
         singleRunTaskMaster.RemoveObject();
         singleRunTaskSlave.RemoveObject();
diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java
index 9b7d2df2..e4415b5d 100644
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -62,6 +62,8 @@ public class MainForm extends Form implements MainWindow {
         if (UI.debugWindow != null)
             ((FormWithSplitters) UI.debugWindow).SaveSplitters();
         //--
+        Global.db.SaveCredentials();
+        //--
         Global.FinishApplication();
     }
     public MainForm() {