diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/BoneMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/BoneMeasurementView.java
index 8acb85b7..394d4e52 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/BoneMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/BoneMeasurementView.java
@@ -23,6 +23,7 @@ import com.health.openscale.R;
 import com.health.openscale.core.datatypes.ScaleMeasurement;
 import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
+import com.health.openscale.core.utils.Converters;
 
 public class BoneMeasurementView extends FloatMeasurementView {
     // Don't change key value, it may be stored persistent in preferences
@@ -39,22 +40,22 @@ public class BoneMeasurementView extends FloatMeasurementView {
 
     @Override
     protected float getMeasurementValue(ScaleMeasurement measurement) {
-        return measurement.getBone();
+        return Converters.fromKilogram(measurement.getBone(), getScaleUser().getScaleUnit());
     }
 
     @Override
     protected void setMeasurementValue(float value, ScaleMeasurement measurement) {
-        measurement.setBone(value);
+        measurement.setBone(Converters.toKilogram(value, getScaleUser().getScaleUnit()));
     }
 
     @Override
     public String getUnit() {
-        return "kg";
+        return getScaleUser().getScaleUnit().toString();
     }
 
     @Override
     protected float getMaxValue() {
-        return 50;
+        return Converters.fromKilogram(50, getScaleUser().getScaleUnit());
     }
 
     @Override