diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 2feaa6c2dc..76c72878e8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -367,6 +367,7 @@
 
     <check_box
      control_name="UseDisplayNames"
+     enabled_control="AvatarNameTagMode"
      follows="top|left"
      height="16"
      label="View Display Names"
@@ -378,7 +379,7 @@
      top_pad="3"/>
    <check_box
      control_name="FSNameTagShowLegacyUsernames"
-     enabled_control="NameTagShowUserNames"
+     enabled_control="NameTagShowUsernames"
      height="16"
      label="Legacy names instead of usernames"
      layout="topleft"