diff --git a/include/boost/process/v2/windows/with_logon_launcher.hpp b/include/boost/process/v2/windows/with_logon_launcher.hpp
index 064d3b16..29c0e127 100644
--- a/include/boost/process/v2/windows/with_logon_launcher.hpp
+++ b/include/boost/process/v2/windows/with_logon_launcher.hpp
@@ -20,7 +20,7 @@ namespace windows
 /// A windows launcher using CreateProcessWithLogon instead of CreateProcess
 struct with_logon_launcher : default_launcher
 {
-  std::wstring username, domain, password;
+  std::wstring username, password, domain;
   DWORD logon_flags{0u};
 
   with_logon_launcher(std::wstring username = L"",
diff --git a/test/v2/process.cpp b/test/v2/process.cpp
index 8999b432..ba95d5e1 100644
--- a/test/v2/process.cpp
+++ b/test/v2/process.cpp
@@ -377,7 +377,7 @@ BOOST_AUTO_TEST_CASE(popen)
     // default CWD
     bpv::popen proc(/*bpv::default_process_launcher(), */ctx, pth, {"echo"});
 
-    asio::write(proc, asio::buffer("FOOBAR"));
+    BOOST_CHECK_EQUAL(asio::write(proc, asio::buffer("FOOBAR", 6)), 6);
     proc.get_stdin().close();
 
     std::string res;
@@ -391,10 +391,8 @@ BOOST_AUTO_TEST_CASE(popen)
                      || ec == asio::error::bad_descriptor,
                      ec.message());
     BOOST_REQUIRE_GE(n, 1u);
-    // remove EOF
-    res.pop_back();
     BOOST_CHECK_EQUAL(res, "FOOBAR");
-
+    proc.get_stdin().close();
     proc.wait();
     BOOST_CHECK_MESSAGE(proc.exit_code() == 0, proc.exit_code());
 }