diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
index abc783856b..0d8d6893f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
@@ -164,11 +164,11 @@ class DexcomPlugin @Inject constructor(
                         result.calibrationsInserted.forEach {   calibration ->
                             calibration.glucose?.let {  glucosevalue ->
                                 uel.log(
-                                    Action.CAREPORTAL,
+                                    Action.CALIBRATION,
                                     Sources.Dexcom,
                                     ValueWithUnit.Timestamp(calibration.timestamp),
                                     ValueWithUnit.TherapyEventType(calibration.type),
-                                    ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString())
+                                    ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString)
                                 )
                             }
                             aapsLogger.debug(LTag.DATABASE, "Inserted calibration $calibration")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
index e7d52cd536..1dca40f24c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
@@ -153,11 +153,11 @@ class GlunovoPlugin @Inject constructor(
                         savedValues.calibrationsInserted.forEach {  calibration ->
                             calibration.glucose?.let { glucosevalue ->
                                 uel.log(
-                                    UserEntry.Action.CAREPORTAL,
+                                    UserEntry.Action.CALIBRATION,
                                     UserEntry.Sources.Dexcom,
                                     ValueWithUnit.Timestamp(calibration.timestamp),
                                     ValueWithUnit.TherapyEventType(calibration.type),
-                                    ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString())
+                                    ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString)
                                 )
                             }
                             aapsLogger.debug(LTag.DATABASE, "Inserted calibration $calibration")
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt
index f2421908ad..bea32f40d7 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt
@@ -66,9 +66,9 @@ data class TherapyEvent(
             previous.interfaceIDs.nightscoutId == null &&
             interfaceIDs.nightscoutId != null
 
-    enum class GlucoseUnit {
-        MGDL,
-        MMOL;
+    enum class GlucoseUnit (val toString: String) {
+        MGDL (ValueWithUnit.MGDL),
+        MMOL (ValueWithUnit.MMOL);
 
         companion object
     }