1 files changed, 8 insertions, 0 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTask.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTask.java
index 6207cd2a5a..d61e15016a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTask.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTask.java
@@ -197,6 +197,14 @@ public class DistributionEngineInitTask implements Runnable {
         CambriaErrorResponse registerStatus = cambriaHandler
             .registerToTopic(environmentEntry.getDmaapUebAddress(), environmentEntry.getUebApikey(), environmentEntry.getUebSecretKey(),
                 environmentEntry.getUebApikey(), subscriberType, topicName);
+
+        if (CambriaOperationStatus.AUTHENTICATION_ERROR.equals(registerStatus.getOperationStatus())
+                || CambriaOperationStatus.CONNNECTION_ERROR.equals(registerStatus.getOperationStatus())){
+            registerStatus = cambriaHandler
+                    .registerToTopic(environmentEntry.getDmaapUebAddress(), deConfiguration.getUebPublicKey(), deConfiguration.getUebSecretKey(),
+                            environmentEntry.getUebApikey(), subscriberType, topicName);
+        }
+
         String role = CONSUMER;
         if (subscriberType == SubscriberTypeEnum.PRODUCER) {
             role = PRODUCER;