diff --git a/ConfigFile.cc b/ConfigFile.cc
index 61ebf2e426e1fae35ca507dfe7128e881c06c298..72260b34b948f113b9d00d37609f5ea42dda402c 100644
--- a/ConfigFile.cc
+++ b/ConfigFile.cc
@@ -516,6 +516,19 @@ ConfigFile::checkPass(WarningConsolidation &warnings) const
               cerr << "ERROR (node " << it->first << "): the UserName option must be passed for every remote node." << endl;
               exit(EXIT_FAILURE);
             }
+          if (it->second->operatingSystem.compare("windows") == 0)
+            {
+              if (it->second->password.empty())
+                {
+                  cerr << "ERROR (node " << it->first << "): the Password option must be passed under Windows for every remote node." << endl;
+                  exit(EXIT_FAILURE);
+                }
+              if (it->second->remoteDrive.empty())
+                {
+                  cerr << "ERROR (node " << it->first << "): the RemoteDrive option must be passed under Windows for every remote node." << endl;
+                  exit(EXIT_FAILURE);
+                }
+            }
 #if defined(_WIN32) || defined(__CYGWIN32__)
           if (it->second->operatingSystem.empty())
             {