diff --git a/client/ui/pages_logic/ServerContainersLogic.cpp b/client/ui/pages_logic/ServerContainersLogic.cpp
index aeec8161..870a10db 100644
--- a/client/ui/pages_logic/ServerContainersLogic.cpp
+++ b/client/ui/pages_logic/ServerContainersLogic.cpp
@@ -31,6 +31,7 @@ void ServerContainersLogic::onUpdatePage()
     p_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
 
     set_isManagedServer(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
+    uiLogic()->m_installCredentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
     emit updatePage();
 }
 
diff --git a/client/ui/pages_logic/ServerListLogic.cpp b/client/ui/pages_logic/ServerListLogic.cpp
index e91b1e33..79d13c8b 100644
--- a/client/ui/pages_logic/ServerListLogic.cpp
+++ b/client/ui/pages_logic/ServerListLogic.cpp
@@ -21,7 +21,6 @@ void ServerListLogic::onServerListPushbuttonDefaultClicked(int index)
 void ServerListLogic::onServerListPushbuttonSettingsClicked(int index)
 {
     uiLogic()->m_selectedServerIndex = index;
-    uiLogic()->m_installCredentials = m_settings->serverCredentials(index);
     uiLogic()->goToPage(Page::ServerSettings);
 }