1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index accaa59f429..cfaf3fd686d 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -77,7 +77,7 @@ AdminSessionI::_register(const SessionServantManagerPtr& servantManager, const I
 
     string category;
 
-    if(con != 0)
+    if(con)
     {
         category = _database->getInstanceName() + "-" + IceUtil::generateUUID();
      
@@ -86,9 +86,11 @@ AdminSessionI::_register(const SessionServantManagerPtr& servantManager, const I
         templateId.category = category;
         
         _adminCallbackTemplate = _registry->createAdminCallbackProxy(templateId);
+
+        setConnectionCallback(con);
     }
 
-    Ice::ObjectPrx session =  _servantManager->addSession(this, con, category);
+    Ice::ObjectPrx session = _servantManager->addSession(this, con, category);
 
     _admin = AdminPrx::uncheckedCast(_servantManager->add(new AdminI(_database, _registry, this), this));