diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 5bf18d994..582bc9ffa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -158,4 +158,5 @@ public class DeviceSettingsPreferenceConst {
 
     public static final String PREF_SOUNDS = "sounds";
     public static final String PREF_AUTH_KEY = "authkey";
+    public static final String PREF_USER_FITNESS_GOAL = "fitness_goal";
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index ccdc0e024..7a884c319 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -453,6 +453,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         addPreferenceHandlerFor(PREF_SONY_CONNECT_TWO_DEVICES);
 
         addPreferenceHandlerFor(PREF_QC35_NOISE_CANCELLING_LEVEL);
+        addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL);
 
         String sleepTimeState = prefs.getString(PREF_SLEEP_TIME, PREF_DO_NOT_DISTURB_OFF);
         boolean sleepTimeScheduled = sleepTimeState.equals(PREF_DO_NOT_DISTURB_SCHEDULED);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java
index b9528ab2e..5f2ec9c39 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java
@@ -169,7 +169,6 @@ public class ZeTimeConstants {
     public static final String PREF_LOW_POWER_SIGNALING = "zetime_vibration_profile_lowpower";
     public static final String PREF_ANTI_LOSS_SIGNALING = "zetime_vibration_profile_antiloss";
 
-    public static final String PREF_USER_FITNESS_GOAL = "mi_fitness_goal";
     public static final String PREF_USER_SLEEP_GOAL = "activity_user_sleep_duration";
     public static final String PREF_USER_CALORIES_GOAL = "activity_user_calories_burnt";
     public static final String PREF_USER_DISTANCE_GOAL = "activity_user_distance_meters";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java
index bc9bbcedb..9aa70641b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java
@@ -85,7 +85,6 @@ public class ZeTimePreferenceActivity extends AbstractSettingsActivity {
         addPreferenceHandlerFor(ZeTimeConstants.PREF_ZETIME_MIN_HEARTRATE);
 
 
-        addPreferenceHandlerFor(ZeTimeConstants.PREF_USER_FITNESS_GOAL);
         addPreferenceHandlerFor(ZeTimeConstants.PREF_USER_SLEEP_GOAL);
         addPreferenceHandlerFor(ZeTimeConstants.PREF_USER_CALORIES_GOAL);
         addPreferenceHandlerFor(ZeTimeConstants.PREF_USER_DISTANCE_GOAL);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
index 113738cd2..89701c0c9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
@@ -65,7 +65,7 @@ public class ActivityUser {
     public static final String PREF_USER_HEIGHT_CM = "activity_user_height_cm";
     public static final String PREF_USER_WEIGHT_KG = "activity_user_weight_kg";
     public static final String PREF_USER_SLEEP_DURATION = "activity_user_sleep_duration";
-    public static final String PREF_USER_STEPS_GOAL = "mi_fitness_goal"; // FIXME: for compatibility
+    public static final String PREF_USER_STEPS_GOAL = "fitness_goal"; // FIXME: for compatibility
     public static final String PREF_USER_CALORIES_BURNT = "activity_user_calories_burnt";
     public static final String PREF_USER_DISTANCE_METERS = "activity_user_distance_meters";
     public static final String PREF_USER_ACTIVETIME_MINUTES = "activity_user_activetime_minutes";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
index 46679b981..33385e3b1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
@@ -215,7 +215,7 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
                 case ZeTimeConstants.PREF_ZETIME_MIN_HEARTRATE:
                     setHeartRateLimits(builder);
                     break;
-                case ZeTimeConstants.PREF_USER_FITNESS_GOAL:
+                case DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL:
                 case ZeTimeConstants.PREF_USER_SLEEP_GOAL:
                 case ZeTimeConstants.PREF_USER_CALORIES_GOAL:
                 case ZeTimeConstants.PREF_USER_DISTANCE_GOAL:
diff --git a/app/src/main/res/xml/about_user.xml b/app/src/main/res/xml/about_user.xml
index 0d092738b..8a62e160f 100644
--- a/app/src/main/res/xml/about_user.xml
+++ b/app/src/main/res/xml/about_user.xml
@@ -40,7 +40,7 @@
         <EditTextPreference
             android:defaultValue="10000"
             android:inputType="number"
-            android:key="mi_fitness_goal"
+            android:key="fitness_goal"
             android:maxLength="5"
             android:title="@string/miband_prefs_fitness_goal" />
 
diff --git a/app/src/main/res/xml/miband_preferences.xml b/app/src/main/res/xml/miband_preferences.xml
index 3705fa73e..2ef12c9c4 100644
--- a/app/src/main/res/xml/miband_preferences.xml
+++ b/app/src/main/res/xml/miband_preferences.xml
@@ -12,7 +12,7 @@
         <EditTextPreference
             android:defaultValue="10000"
             android:inputType="number"
-            android:key="mi_fitness_goal"
+            android:key="fitness_goal"
             android:maxLength="5"
             android:title="@string/miband_prefs_fitness_goal" />
 
diff --git a/app/src/main/res/xml/zetime_preferences.xml b/app/src/main/res/xml/zetime_preferences.xml
index 02a85af14..6058df64c 100644
--- a/app/src/main/res/xml/zetime_preferences.xml
+++ b/app/src/main/res/xml/zetime_preferences.xml
@@ -20,7 +20,7 @@
         <EditTextPreference
             android:defaultValue="10000"
             android:inputType="number"
-            android:key="mi_fitness_goal"
+            android:key="fitness_goal"
             android:maxLength="5"
             android:title="@string/miband_prefs_fitness_goal" />