diff --git a/src/condor_contrib/aviary/src/hadoop/HadoopObject.cpp b/src/condor_contrib/aviary/src/hadoop/HadoopObject.cpp
index 1fb6144..dd29277 100644
--- a/src/condor_contrib/aviary/src/hadoop/HadoopObject.cpp
+++ b/src/condor_contrib/aviary/src/hadoop/HadoopObject.cpp
@@ -287,7 +287,7 @@ int HadoopObject::start( tHadoopInit & hInit )
             ::SetAttribute(cluster, proc, ATTR_REQUIREMENTS, "( HasJava =?= TRUE ) && ( TARGET.OpSys == \"LINUX\" ) && ( TARGET.HasFileTransfer )");
         }
         
-        if (bValidId && iStatus == RUNNING)
+        if (bValidId && (iStatus == RUNNING || ManagedState == "UNMANAGED" ))
         {   
             ::GetAttributeString( id.cluster, id.proc,  "IPCAddress", IPCAddress);
             ::GetAttributeString( id.cluster, id.proc,  "HTTPAddress", HTTPAddress);
@@ -333,8 +333,8 @@ int HadoopObject::start( tHadoopInit & hInit )
     if (hInit.unmanaged)
     {
         ::SetAttribute(cluster, proc, "GridoopManaged", quote_it("UNMANAGED").c_str());
-        ::SetAttribute(cluster, proc, "IPCAddress", quote_it(hInit.idref.http.c_str()).c_str());
-        ::SetAttribute(cluster, proc, "HTTPAddress", quote_it(hInit.idref.ipcid.c_str()).c_str());
+        ::SetAttribute(cluster, proc, "IPCAddress", quote_it(hInit.idref.ipcid.c_str()).c_str());
+        ::SetAttribute(cluster, proc, "HTTPAddress", quote_it(hInit.idref.http.c_str()).c_str());
         
         // EARLY SET: These attribute are set early so the incoming ad
         // has a change to override them.