diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanSeeMyPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanSeeMyPhoneNumberFragment.kt
index 68661bcbe..20c5a1fce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanSeeMyPhoneNumberFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanSeeMyPhoneNumberFragment.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.profiles.edit.pnp
 
 import android.os.Bundle
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.setFragmentResult
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -56,17 +57,26 @@ class WhoCanSeeMyPhoneNumberFragment : DSLSettingsFragment(
     return configure {
       radioPref(
         title = DSLSettingsText.from(R.string.PhoneNumberPrivacy_everyone),
-        summary = DSLSettingsText.from(R.string.WhoCanSeeMyPhoneNumberFragment__anyone_who_has),
         isChecked = state == WhoCanSeeMyPhoneNumberState.EVERYONE,
         onClick = { viewModel.onEveryoneCanSeeMyPhoneNumberSelected() }
       )
 
       radioPref(
         title = DSLSettingsText.from(R.string.PhoneNumberPrivacy_nobody),
-        summary = DSLSettingsText.from(R.string.WhoCanSeeMyPhoneNumberFragment__nobody_on_signal),
         isChecked = state == WhoCanSeeMyPhoneNumberState.NOBODY,
         onClick = { viewModel.onNobodyCanSeeMyPhoneNumberSelected() }
       )
+
+      textPref(
+        title = DSLSettingsText.from(
+          when (state) {
+            WhoCanSeeMyPhoneNumberState.EVERYONE -> R.string.WhoCanSeeMyPhoneNumberFragment__anyone_who_has
+            WhoCanSeeMyPhoneNumberState.NOBODY -> R.string.WhoCanSeeMyPhoneNumberFragment__nobody_on_signal
+          },
+          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
+          DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant))
+        )
+      )
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index 7aca3d065..4301dff39 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -179,6 +179,7 @@ public final class FeatureFlags {
   @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
   @VisibleForTesting
   static final Map<String, Object> FORCED_VALUES = new HashMap<String, Object>() {{
+    put(PHONE_NUMBER_PRIVACY, true);
   }};
 
   /**
diff --git a/app/src/main/res/layout/who_can_see_my_phone_number_fragment.xml b/app/src/main/res/layout/who_can_see_my_phone_number_fragment.xml
index 2c2301f2b..9ade524ba 100644
--- a/app/src/main/res/layout/who_can_see_my_phone_number_fragment.xml
+++ b/app/src/main/res/layout/who_can_see_my_phone_number_fragment.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dsl_settings_gutter"
         android:layout_marginBottom="16dp"
-        android:text="@string/save"
+        android:text="@string/RegistrationActivity_next"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file