1 files changed, 9 insertions, 0 deletions
diff --git a/src/ui/ui_settings.cpp b/src/ui/ui_settings.cpp
index d41affa..0d3a210 100644
--- a/src/ui/ui_settings.cpp
+++ b/src/ui/ui_settings.cpp
@@ -24,6 +24,7 @@
 #include "countries.hpp"
 #include "administration.hpp"
 #include "administration_writer.hpp"
+#include "administration_reader.hpp"
 
 static contact company_info;
 
@@ -41,6 +42,9 @@ void ui::destroy_settings()
 {
     memops::unalloc(tax_rates);
     memops::unalloc(cost_centers);
+
+    tax_rates = 0;
+    cost_centers = 0;
 }
 
 void ui::setup_settings()
@@ -394,6 +398,11 @@ void ui::draw_settings()
             if (!can_save) ImGui::BeginDisabled();
             ImGui::Spacing();
             if (ImGui::Button(locale::get("form.save"), true)) {
+
+                if (administration::get_file_path() == NULL) {
+                    administration_reader::open_new();
+                }
+
                 administration_writer::set_write_completed_event_callback(_write_company_info_callback);
                 administration::company_info_set(company_info);
             }