diff --git a/src/slic3r/GUI/WifiConfigDialog.cpp b/src/slic3r/GUI/WifiConfigDialog.cpp
index e6126e5147..6b088d8ad5 100644
--- a/src/slic3r/GUI/WifiConfigDialog.cpp
+++ b/src/slic3r/GUI/WifiConfigDialog.cpp
@@ -234,7 +234,8 @@ void WifiConfigDialog::on_ok(wxCommandEvent& e)
     }
 
     if (boost::filesystem::exists(file_path)) {
-        wxString msg_text = GUI::format_wxstr("%1% already exists. Do you want to rewrite it?", file_path.string());
+        // TRN placeholder 1 is path to file
+        wxString msg_text = GUI::format_wxstr(_L("%1% already exists. Do you want to rewrite it?\n(Other items than Wi-Fi credentials will stay unchanged)"), file_path.string());
         WarningDialog dialog(m_parent, msg_text, _L("Warning"), wxYES | wxNO);
         if (dialog.ShowModal() == wxID_NO) {
             return;
diff --git a/src/slic3r/Utils/WifiScanner.cpp b/src/slic3r/Utils/WifiScanner.cpp
index be5f6d5f33..260583516d 100644
--- a/src/slic3r/Utils/WifiScanner.cpp
+++ b/src/slic3r/Utils/WifiScanner.cpp
@@ -416,14 +416,16 @@ void WifiScanner::scan()
     
     for ( const std::string& ssid : ssids)
     {
-        m_map[boost::nowide::widen(ssid)] = {};
+        if (!ssid.empty())
+            m_map[boost::nowide::widen(ssid)] = {};
     }
     if (m_map.empty()) {
         try
         {
             // Second implementation calling "airport" system command
             get_connected_ssid(m_current_ssid);
-            m_map[m_current_ssid] = std::string();
+            if (!m_current_ssid.empty())
+                m_map[m_current_ssid] = std::string();
         }
         catch (const std::exception&)
         {