diff --git a/core/src/main/scala/eu/nomad_lab/normalize/CalculationInfoNormalizer.scala b/core/src/main/scala/eu/nomad_lab/normalize/CalculationInfoNormalizer.scala
index cef6547899b3af08a519d37aff1406e7cd7d1c03..55191764535830fb958ec799ab45c6db4fca48ce 100644
--- a/core/src/main/scala/eu/nomad_lab/normalize/CalculationInfoNormalizer.scala
+++ b/core/src/main/scala/eu/nomad_lab/normalize/CalculationInfoNormalizer.scala
@@ -255,7 +255,7 @@ object CalculationInfoNormalizer extends NormalizerGenerator with StrictLogging
                 backend.addValue("calculation_uploader_name", jn.JString(uploader))
               backend.addValue("calculation_upload_date", jn.JInt(uploadDate))
             case None =>
-              logger.warn(s"could not find pid for $calculation in ${CalculationInfoNormalizer.calcGidToPidMap(calculation.archive.archiveGid)}")
+              logger.warn(s"could not find pid for $calculation")
               ()
           }
           backend.closeSection("section_calculation_info", cId)
@@ -270,9 +270,12 @@ object CalculationInfoNormalizer extends NormalizerGenerator with StrictLogging
           cInfo match {
             case Some(RepoCalcInfo(pid, uploaders, uploadDate)) =>
               backend.addValue("calculation_pid", jn.JString(pid))
-              for (uploader <- uploaders)
-                backend.addValue("calculation_uploader_name", jn.JString(uploader))
-              backend.addValue("calculation_upload_date", jn.JInt(uploadDate))
+              if (cInfoTable.subValueTable("calculation_uploader_name").isEmpty) {
+                for (uploader <- uploaders)
+                  backend.addValue("calculation_uploader_name", jn.JString(uploader))
+              }
+              if (cInfoTable.subValueTable("calculation_upload_date").isEmpty)
+                backend.addValue("calculation_upload_date", jn.JInt(uploadDate))
             case None => ()
           }
         } finally {