diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index 5ce32271..5acaeb3f 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -1561,7 +1561,14 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
             addr.s_addr = localPhotoInfo.ip;
             strcpy(netPhotoInfo.ip, inet_ntoa(addr));
             strcpy(netPhotoInfo.outputPath, path.c_str());
-
+            if (!localPhotoInfo.userName.empty())
+            {
+                strncpy(netPhotoInfo.userName, localPhotoInfo.userName.c_str(), std::min(sizeof(netPhotoInfo.userName) - 1, localPhotoInfo.userName.size()));
+            }
+            if (!localPhotoInfo.password.empty())
+            {
+                strncpy(netPhotoInfo.password, localPhotoInfo.password.c_str(), std::min(sizeof(netPhotoInfo.password) - 1, localPhotoInfo.password.size()));
+            }
             // strcpy(netPhotoInfo.interface, "eth0");
 
             std::vector<uint8_t> img;