diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt
index d4d944514..cde32e461 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt
@@ -11,13 +11,15 @@ import android.widget.TextView
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import org.mozilla.fenix.R
+import kotlin.properties.Delegates
 
 class AccountAuthErrorPreference @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     attributeSetId: Int = android.R.attr.preferenceStyle
 ) : Preference(context, attrs, attributeSetId) {
-    var email: String? = null
+    private var emailView: TextView? = null
+    var email: String? by Delegates.observable<String?>(null) { _, _, new -> updateEmailView(new) }
 
     init {
         layoutResource = R.layout.account_auth_error_preference
@@ -25,9 +27,13 @@ class AccountAuthErrorPreference @JvmOverloads constructor(
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
-        val emailView = holder.findViewById(R.id.email) as TextView
-        emailView.text = email.orEmpty()
-        emailView.visibility = when (email.isNullOrEmpty()) {
+        emailView = holder.findViewById(R.id.email) as TextView
+        updateEmailView(email)
+    }
+
+    private fun updateEmailView(email: String?) {
+        emailView?.text = email.orEmpty()
+        emailView?.visibility = when (email.isNullOrEmpty()) {
             true -> View.GONE
             false -> View.VISIBLE
         }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt
index 6976568cb..32248ea1f 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt
@@ -11,13 +11,21 @@ import android.widget.TextView
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import org.mozilla.fenix.R
+import kotlin.properties.Delegates
 
 class AccountPreference @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null
 ) : Preference(context, attrs) {
-    var displayName: String? = null
-    var email: String? = null
+    private var emailView: TextView? = null
+    private var displayNameView: TextView? = null
+    var displayName: String? by Delegates.observable<String?>(null) { _, _, new ->
+        updateDisplayName(new)
+    }
+
+    var email: String? by Delegates.observable<String?>(null) { _, _, new ->
+        new?.let { updateEmailText(it) }
+    }
 
     init {
         layoutResource = R.layout.account_preference
@@ -25,18 +33,26 @@ class AccountPreference @JvmOverloads constructor(
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
-        val displayNameView = holder.findViewById(R.id.displayName) as TextView
-        val emailView = holder.findViewById(R.id.email) as TextView
+        displayNameView = holder.findViewById(R.id.displayName) as TextView
+        emailView = holder.findViewById(R.id.email) as TextView
 
-        displayNameView.text = displayName.orEmpty()
-        displayNameView.visibility = when (displayName.isNullOrEmpty()) {
-            true -> View.GONE
-            false -> View.VISIBLE
-        }
+        updateDisplayName(displayName)
         // There is a potential for a race condition here. We might not have the user profile by the time we display
         // this field, in which case we won't have the email address (or the display name, but that we may just not have
         // at all even after fetching the profile). We don't hide the email field or change its text if email is missing
         // because in the layout a default value ("Firefox Account") is specified, which will be displayed instead.
-        email?.let { emailView.text = it }
+        email?.let { emailView?.text = it }
+    }
+
+    private fun updateEmailText(email: String) {
+        emailView?.text = email
+    }
+
+    private fun updateDisplayName(name: String?) {
+        displayNameView?.text = name.orEmpty()
+        displayNameView?.visibility = when (displayName.isNullOrEmpty()) {
+            true -> View.GONE
+            false -> View.VISIBLE
+        }
     }
 }
diff --git a/app/src/main/res/layout/account_preference.xml b/app/src/main/res/layout/account_preference.xml
index 5cddc705f..152c8a955 100644
--- a/app/src/main/res/layout/account_preference.xml
+++ b/app/src/main/res/layout/account_preference.xml
@@ -2,27 +2,27 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/account_preference_background"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:foreground="?android:attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:foreground="?android:attr/selectableItemBackground">
+    android:paddingEnd="16dp">
 
     <FrameLayout
         android:id="@+id/icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
+
         <androidx.preference.internal.PreferenceImageView
             android:id="@android:id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:maxWidth="48dp"
-            app:maxHeight="48dp"/>
+            app:maxHeight="48dp"
+            app:maxWidth="48dp" />
     </FrameLayout>
 
     <RelativeLayout
@@ -30,35 +30,38 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
         android:layout_marginEnd="6dp"
+        android:layout_weight="1"
         android:paddingStart="16dp"
         android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:layout_weight="1">
+        android:paddingBottom="16dp">
 
-        <TextView android:id="@+id/displayName"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textColor="?primaryText"
-                  android:textSize="16sp"
-                  android:ellipsize="marquee"
-                  android:fadingEdge="horizontal"
-                  android:visibility="gone"/>
+        <TextView
+            android:id="@+id/displayName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:textColor="?primaryText"
+            android:textSize="16sp"
+            android:visibility="gone" />
 
-        <TextView android:id="@+id/email"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_below="@id/displayName"
-                  android:layout_alignStart="@id/displayName"
-                  android:textColor="?primaryText"
-                  android:text="@string/preferences_account_default_name"
-                  android:maxLines="4"/>
+        <TextView
+            android:id="@+id/email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/displayName"
+            android:layout_alignStart="@id/displayName"
+            android:maxLines="4"
+            android:text="@string/preferences_account_default_name"
+            android:textColor="?primaryText" />
 
     </RelativeLayout>
 
-    <LinearLayout android:id="@android:id/widget_frame"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_vertical"
-                  android:orientation="vertical"/>
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
 
 </LinearLayout>