diff --git a/clientgui/DlgSelectComputer.cpp b/clientgui/DlgSelectComputer.cpp
index 40cbe7a17d..42a4049d40 100644
--- a/clientgui/DlgSelectComputer.cpp
+++ b/clientgui/DlgSelectComputer.cpp
@@ -236,8 +236,9 @@ void CDlgSelectComputer::OnComputerNameUpdated( wxCommandEvent& WXUNUSED(event)
 
     wxString name = m_ComputerNameCtrl->GetValue();
     if (pDoc->IsComputerNameLocal(name)) {
-        pDoc->m_pNetworkConnection->GetLocalPassword(strPassword);
-        m_ComputerPasswordCtrl->SetValue(strPassword);
+        if (pDoc->m_pNetworkConnection->GetLocalPassword(strPassword) == 0) {
+            m_ComputerPasswordCtrl->SetValue(strPassword);
+        }
     }
 }