diff --git a/website/client/components/settings/site.vue b/website/client/components/settings/site.vue
index 4061448165..ab8a63c12e 100644
--- a/website/client/components/settings/site.vue
+++ b/website/client/components/settings/site.vue
@@ -66,9 +66,6 @@
         .checkbox
           input(type='checkbox', v-model='user.preferences.suppressModals.streak', @change='set("suppressModals", "streak")')
           label {{ $t('suppressStreakModal') }}
-        .checkbox
-          input(type='checkbox', v-model='user.preferences.searchableUsername', @change='set("searchableUsername")')
-          label {{ $t('searchableUsernameSetting') }}
         //- .checkbox
         //-   label {{ $t('confirmScoreNotes') }}
         //-     input(type='checkbox', v-model='user.preferences.tasks.confirmScoreNotes', @change='set({"preferences.tasks.confirmScoreNotes": user.preferences.tasks.confirmScoreNotes ? true: false})')
@@ -86,6 +83,18 @@
 
         hr
 
+        div
+          h5 {{ $t('mentioning') }}
+          h6 {{ $t('suggestMyUsername') }}
+          .form-horizontal
+            select.form-control(
+              v-model='user.preferences.searchableUsername',
+              @change='set("searchableUsername")'
+            )
+              option(v-for='option in searchableUsernameOptions' :value='option.value') {{ option.text }}
+
+        hr
+
         div
           h5 {{ $t('customDayStart') }}
           .alert.alert-warning {{ $t('customDayStartInfo1') }}
@@ -259,6 +268,10 @@ export default {
       },
       displayNameIssues: [],
       usernameIssues: [],
+      searchableUsernameOptions: [
+        {text: this.$t('onlyPrivateSpaces'), value: false},
+        {text: this.$t('everywhere'), value: true},
+      ],
     };
   },
   mounted () {
diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json
index 978b641c75..799fdcc68d 100644
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -204,8 +204,10 @@
     "goToSettings": "Go to Settings",
     "usernameVerifiedConfirmation": "Your username, <%= username %>, is confirmed!",
     "usernameNotVerified": "Please confirm your username.",
-    "changeUsernameDisclaimer": "We will be transitioning login names to unique, public usernames soon. This username will be used for invitations, @mentions in chat, and messaging.",
+    "changeUsernameDisclaimer": "This username will be used for invitations, @mentions in chat, and messaging.",
     "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!",
-    "searchableUsernameSetting": "Allow username to appear in searches",
-    "searchableUsernamePopover": "If enabled, other users can @mention and invite you easier."
+    "mentioning": "Mentioning",
+    "suggestMyUsername": "Suggest my username",
+    "everywhere": "Everywhere",
+    "onlyPrivateSpaces": "Only in private spaces"
 }
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index 768042c77b..b98a945ca7 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -460,7 +460,7 @@ let schema = new Schema({
     reverseChatOrder: {$type: Boolean, default: false},
     background: String,
     displayInviteToPartyWhenPartyIs1: {$type: Boolean, default: true},
-    searchableUsername: {$type: Boolean, default: true},
+    searchableUsername: {$type: Boolean, default: false},
     webhooks: {$type: Schema.Types.Mixed, default: () => {
       return {};
     }},