diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
index 2cdea81343..6d23c49cf4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
@@ -199,20 +199,21 @@ public final class Megaphones {
                                              .enableSnooze(null)
                                              .setImage(R.drawable.profile_megaphone);
 
-    Megaphone.EventListener eventListener = (megaphone, listener) -> {
-      listener.onMegaphoneSnooze(Event.PROFILE_NAMES_FOR_ALL);
-      listener.onMegaphoneNavigationRequested(new Intent(context, EditProfileActivity.class));
-    };
-
     if (TextSecurePreferences.getProfileName(ApplicationDependencies.getApplication()) == ProfileName.EMPTY) {
       return builder.setTitle(R.string.ProfileNamesMegaphone__add_a_profile_name)
                     .setBody(R.string.ProfileNamesMegaphone__this_will_be_displayed_when_you_start)
-                    .setActionButton(R.string.ProfileNamesMegaphone__add_profile_name, eventListener)
+                    .setActionButton(R.string.ProfileNamesMegaphone__add_profile_name, (megaphone, listener) -> {
+                      listener.onMegaphoneSnooze(Event.PROFILE_NAMES_FOR_ALL);
+                      listener.onMegaphoneNavigationRequested(new Intent(context, EditProfileActivity.class));
+                    })
                     .build();
     } else {
       return builder.setTitle(R.string.ProfileNamesMegaphone__confirm_your_profile_name)
                     .setBody(R.string.ProfileNamesMegaphone__your_profile_can_now_include)
-                    .setActionButton(R.string.ProfileNamesMegaphone__confirm_name, eventListener)
+                    .setActionButton(R.string.ProfileNamesMegaphone__confirm_name, (megaphone, listener) -> {
+                      listener.onMegaphoneCompleted(Event.PROFILE_NAMES_FOR_ALL);
+                      listener.onMegaphoneNavigationRequested(new Intent(context, EditProfileActivity.class));
+                    })
                     .build();
     }
   }
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 88e1c07e8a..e64a3caa57 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -46,15 +46,15 @@ public final class FeatureFlags {
   private static final String PREFIX         = "android.";
   private static final long   FETCH_INTERVAL = TimeUnit.HOURS.toMillis(2);
 
-  private static final String UUIDS                           = generateKey("uuids");
-  private static final String PROFILE_DISPLAY                 = generateKey("profileDisplay");
-  private static final String MESSAGE_REQUESTS                = generateKey("messageRequests");
-  private static final String USERNAMES                       = generateKey("usernames");
-  private static final String STORAGE_SERVICE                 = generateKey("storageService");
-  private static final String PINS_FOR_ALL                    = generateKey("pinsForAll");
-  private static final String PINS_MEGAPHONE_KILL_SWITCH      = generateKey("pinsMegaphoneKillSwitch");
-  private static final String PROFILE_NAMES_MEGAPHONE_ENABLED = generateKey("profileNamesMegaphoneEnabled");
-  private static final String VIDEO_TRIMMING                  = generateKey("videoTrimming");
+  private static final String UUIDS                      = generateKey("uuids");
+  private static final String PROFILE_DISPLAY            = generateKey("profileDisplay");
+  private static final String MESSAGE_REQUESTS           = generateKey("messageRequests");
+  private static final String USERNAMES                  = generateKey("usernames");
+  private static final String STORAGE_SERVICE            = generateKey("storageService");
+  private static final String PINS_FOR_ALL               = generateKey("pinsForAll");
+  private static final String PINS_MEGAPHONE_KILL_SWITCH = generateKey("pinsMegaphoneKillSwitch");
+  private static final String PROFILE_NAMES_MEGAPHONE    = generateKey("profileNamesMegaphone");
+  private static final String VIDEO_TRIMMING             = generateKey("videoTrimming");
 
   /**
    * We will only store remote values for flags in this set. If you want a flag to be controllable
@@ -65,7 +65,7 @@ public final class FeatureFlags {
       VIDEO_TRIMMING,
       PINS_FOR_ALL,
       PINS_MEGAPHONE_KILL_SWITCH,
-      PROFILE_NAMES_MEGAPHONE_ENABLED
+      PROFILE_NAMES_MEGAPHONE
   );
 
   /**
@@ -173,7 +173,7 @@ public final class FeatureFlags {
 
   /** Safety switch for disabling profile names megaphone */
   public static boolean profileNamesMegaphoneEnabled() {
-    return getValue(PROFILE_NAMES_MEGAPHONE_ENABLED, false) &&
+    return getValue(PROFILE_NAMES_MEGAPHONE, false) &&
            TextSecurePreferences.getFirstInstallVersion(ApplicationDependencies.getApplication()) < 600;
   }