diff --git a/src/slic3r/GUI/Preset.cpp b/src/slic3r/GUI/Preset.cpp
index c50c7113ba..bab3293a4c 100644
--- a/src/slic3r/GUI/Preset.cpp
+++ b/src/slic3r/GUI/Preset.cpp
@@ -565,7 +565,8 @@ static bool profile_print_params_same(const DynamicPrintConfig &cfg1, const Dyna
     for (const char *key : { "compatible_prints", "compatible_prints_condition", 
                              "compatible_printers", "compatible_printers_condition", "inherits", 
                              "print_settings_id", "filament_settings_id", "sla_print_settings_id", "sla_material_settings_id", "printer_settings_id",
-                             "printer_model", "printer_variant", "default_print_profile", "default_filament_profile", "default_sla_print_profile", "default_sla_material_profile" })
+                             "printer_model", "printer_variant", "default_print_profile", "default_filament_profile", "default_sla_print_profile", "default_sla_material_profile",
+                             "printhost_apikey", "printhost_cafile" })
         diff.erase(std::remove(diff.begin(), diff.end(), key), diff.end());
     // Preset with the same name as stored inside the config exists.
     return diff.empty();
diff --git a/src/slic3r/GUI/PresetBundle.cpp b/src/slic3r/GUI/PresetBundle.cpp
index 2917a3622c..166a4e9e9a 100644
--- a/src/slic3r/GUI/PresetBundle.cpp
+++ b/src/slic3r/GUI/PresetBundle.cpp
@@ -445,6 +445,14 @@ DynamicPrintConfig PresetBundle::full_config() const
         this->full_sla_config();
 }
 
+DynamicPrintConfig PresetBundle::full_config_secure() const
+{
+    DynamicPrintConfig config = this->full_config();
+    config.erase("printhost_apikey");
+    config.erase("printhost_cafile");
+    return config;
+}
+
 DynamicPrintConfig PresetBundle::full_fff_config() const
 {    
     DynamicPrintConfig out;
diff --git a/src/slic3r/GUI/PresetBundle.hpp b/src/slic3r/GUI/PresetBundle.hpp
index c43a67b40f..1bea146ddd 100644
--- a/src/slic3r/GUI/PresetBundle.hpp
+++ b/src/slic3r/GUI/PresetBundle.hpp
@@ -65,6 +65,8 @@ public:
         { return prints.has_defaults_only() && filaments.has_defaults_only() && printers.has_defaults_only(); }
 
     DynamicPrintConfig          full_config() const;
+    // full_config() with the "printhost_apikey" and "printhost_cafile" removed.
+    DynamicPrintConfig          full_config_secure() const;
 
     // Load user configuration and store it into the user profiles.
     // This method is called by the configuration wizard.
diff --git a/src/slic3r/Utils/FixModelByWin10.cpp b/src/slic3r/Utils/FixModelByWin10.cpp
index bf91597d30..4b487588a0 100644
--- a/src/slic3r/Utils/FixModelByWin10.cpp
+++ b/src/slic3r/Utils/FixModelByWin10.cpp
@@ -352,7 +352,7 @@ void fix_model_by_win10_sdk_gui(const ModelObject &model_object, const Print &pr
 			Model model;
             DynamicPrintConfig config;
 			model.add_object(model_object);
-			if (! Slic3r::store_3mf(path_src.string().c_str(), &model, &config/*const_cast<Print*>(&print), false*/)) {
+			if (! Slic3r::store_3mf(path_src.string().c_str(), &model, &config)) {
 				boost::filesystem::remove(path_src);
 				throw std::runtime_error(L("Export of a temporary 3mf file failed"));
 			}
@@ -365,7 +365,7 @@ void fix_model_by_win10_sdk_gui(const ModelObject &model_object, const Print &pr
 			boost::filesystem::remove(path_src);
             // PresetBundle bundle;
 			on_progress(L("Loading the repaired model"), 80);
-            bool loaded = Slic3r::load_3mf(path_dst.string().c_str(), &config/*bundle*/, &result);
+            bool loaded = Slic3r::load_3mf(path_dst.string().c_str(), &config, &result);
             result.objects[0]->name = boost::filesystem::path(model_object.name).filename().stem().string() + "_fixed";
 		    boost::filesystem::remove(path_dst);
 			if (! loaded)