diff --git a/src/llconserverdlg.cpp b/src/llconserverdlg.cpp
index dfba9ec5..3808019f 100755
--- a/src/llconserverdlg.cpp
+++ b/src/llconserverdlg.cpp
@@ -357,17 +357,14 @@ void CLlconServerDlg::OnRegisterServerStateChanged ( int value )
     // apply new setting to the server and update it
     pServer->SetServerListEnabled ( bRegState );
 
-    // If registering is enabled, update data. If registering is disabled,
-    // unregister slave server
-    if ( bRegState )
-    {
-        pServer->UpdateServerList();
-    }
-    else
+    // if registering is disabled, unregister slave server
+    if ( !bRegState )
     {
         pServer->UnregisterSlaveServer();
     }
 
+    pServer->UpdateServerList();
+
     // update GUI dependencies
     UpdateGUIDependencies();
 }