diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99b81c0f..b065bee1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ In this release we're introducing family features that allow users to create fam
 ## Fixed
 
 - Sign out button works again. #1844
+- Users always have default distance unit set to kilometers. #1832
 
 ## Changed
 
diff --git a/app/javascript/controllers/family_members_controller.js b/app/javascript/controllers/family_members_controller.js
index b77a9273..0cf1e698 100644
--- a/app/javascript/controllers/family_members_controller.js
+++ b/app/javascript/controllers/family_members_controller.js
@@ -239,7 +239,7 @@ export default class extends Controller {
   }
 
   createTooltipContent(lastSeen) {
-    return `Last updated: ${lastSeen}`;
+    return `Last seen: ${lastSeen}`;
   }
 
   createPopupContent(location, lastSeen) {
@@ -264,7 +264,7 @@ export default class extends Controller {
           ${location.latitude.toFixed(6)}, ${location.longitude.toFixed(6)}
         </p>
         <p style="margin: 0; font-size: 12px; color: ${mutedColor}; padding-top: 8px; border-top: 1px solid ${isDark ? '#374151' : '#e5e7eb'};">
-          <strong>Last updated:</strong> ${lastSeen}
+          <strong>Last seen:</strong> ${lastSeen}
         </p>
       </div>
     `;
@@ -483,4 +483,4 @@ export default class extends Controller {
   getFamilyMemberCount() {
     return this.familyMemberLocations ? Object.keys(this.familyMemberLocations).length : 0;
   }
-}
\ No newline at end of file
+}
diff --git a/app/views/map/index.html.erb b/app/views/map/index.html.erb
index 85686409..17f31e0c 100644
--- a/app/views/map/index.html.erb
+++ b/app/views/map/index.html.erb
@@ -67,7 +67,7 @@
         data-points-target="map"
         data-api_key="<%= current_user.api_key %>"
         data-self_hosted="<%= @self_hosted %>"
-        data-user_settings='<%= (current_user.settings || {}).to_json.html_safe %>'
+        data-user_settings='<%= current_user.safe_settings.settings.to_json.html_safe %>'
         data-user_theme="<%= current_user&.theme || 'dark' %>"
         data-coordinates='<%= @coordinates.to_json.html_safe %>'
         data-tracks='<%= @tracks.to_json.html_safe %>'
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index e852acc8..2d1420af 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -18,7 +18,7 @@
         class="w-full h-full rounded-lg"
         data-trips-target="container"
         data-api_key="<%= current_user.api_key %>"
-        data-user_settings="<%= current_user.settings.to_json %>"
+        data-user_settings="<%= current_user.safe_settings.settings.to_json %>"
         data-path="<%= trip.path.to_json %>"
         data-started_at="<%= trip.started_at %>"
         data-ended_at="<%= trip.ended_at %>"
diff --git a/app/views/trips/_path.html.erb b/app/views/trips/_path.html.erb
index f3eeb15e..eb0679d2 100644
--- a/app/views/trips/_path.html.erb
+++ b/app/views/trips/_path.html.erb
@@ -5,7 +5,7 @@
     data-controller="trips"
     data-trips-target="container"
     data-api_key="<%= trip.user.api_key %>"
-    data-user_settings="<%= trip.user.settings.to_json %>"
+    data-user_settings="<%= trip.user.safe_settings.settings.to_json %>"
     data-path="<%= trip.path.coordinates.to_json %>"
     data-started_at="<%= trip.started_at %>"
     data-ended_at="<%= trip.ended_at %>"
diff --git a/app/views/trips/_trip.html.erb b/app/views/trips/_trip.html.erb
index 4f6fb95b..87a226b5 100644
--- a/app/views/trips/_trip.html.erb
+++ b/app/views/trips/_trip.html.erb
@@ -15,7 +15,7 @@
             data-trip-map-trip-id-value="<%= trip.id %>"
             data-trip-map-path-value="<%= trip.path.coordinates.to_json %>"
             data-trip-map-api-key-value="<%= current_user.api_key %>"
-            data-trip-map-user-settings-value="<%= current_user.settings.to_json %>"
+            data-trip-map-user-settings-value="<%= current_user.safe_settings.settings.to_json %>"
             data-trip-map-timezone-value="<%= Rails.configuration.time_zone %>">
       </div>
     </div>