diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index f062e5a51..8008ab3d0 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -5072,6 +5072,9 @@
   "autoIGCToolName": "Enable writing assistance",
   "autoIGCToolDescription": "Automatically run Pangea Chat tools to correct sent messages to target language.",
   "emptyAudioError": "Recording failed. Please check your audio permissions and try again.",
+  "changeEmail": "Change email",
+  "withTheseAddressesDescription": "With these email addresses you can log in, recover your password, and manage subscriptions.",
+  "noAddressDescription": "You have not added any email addresses yet.",
   "perfectPractice": "Perfect practice!",
   "greatPractice": "Great practice!",
   "usedNoHints": "Nice job not using any hints!",
diff --git a/lib/pages/settings_3pid/settings_3pid_view.dart b/lib/pages/settings_3pid/settings_3pid_view.dart
index c466b0a24..e854ff634 100644
--- a/lib/pages/settings_3pid/settings_3pid_view.dart
+++ b/lib/pages/settings_3pid/settings_3pid_view.dart
@@ -20,7 +20,10 @@ class Settings3PidView extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         leading: const Center(child: BackButton()),
-        title: Text(L10n.of(context).passwordRecovery),
+        // #Pangea
+        // title: Text(L10n.of(context).passwordRecovery),
+        title: Text(L10n.of(context).changeEmail),
+        // Pangea#
         actions: [
           IconButton(
             icon: const Icon(Icons.add_outlined),
@@ -66,9 +69,13 @@ class Settings3PidView extends StatelessWidget {
                   ),
                   title: Text(
                     identifier.isEmpty
-                        ? L10n.of(context).noPasswordRecoveryDescription
-                        : L10n.of(context)
-                            .withTheseAddressesRecoveryDescription,
+                        // #Pangea
+                        // ? L10n.of(context).noPasswordRecoveryDescription
+                        // : L10n.of(context)
+                        //     .withTheseAddressesRecoveryDescription,isEmpty
+                        ? L10n.of(context).noAddressDescription
+                        : L10n.of(context).withTheseAddressesDescription,
+                    // Pangea#
                   ),
                 ),
                 const Divider(),
diff --git a/lib/pages/settings_password/settings_password_view.dart b/lib/pages/settings_password/settings_password_view.dart
index b52a22340..ceb9f9186 100644
--- a/lib/pages/settings_password/settings_password_view.dart
+++ b/lib/pages/settings_password/settings_password_view.dart
@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 
-import 'package:go_router/go_router.dart';
-
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pages/settings_password/settings_password.dart';
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
@@ -76,11 +74,13 @@ class SettingsPasswordView extends StatelessWidget {
                         : Text(L10n.of(context).changePassword),
                   ),
                 ),
-                const SizedBox(height: 16),
-                TextButton(
-                  child: Text(L10n.of(context).passwordRecoverySettings),
-                  onPressed: () => context.go('/rooms/settings/security/3pid'),
-                ),
+                // #Pangea
+                // const SizedBox(height: 16),
+                // TextButton(
+                //   child: Text(L10n.of(context).passwordRecoverySettings),
+                //   onPressed: () => context.go('/rooms/settings/security/3pid'),
+                // ),
+                // Pangea#
               ],
             ),
           ),
diff --git a/lib/pages/settings_security/settings_security_view.dart b/lib/pages/settings_security/settings_security_view.dart
index b181c9915..d2715fa6c 100644
--- a/lib/pages/settings_security/settings_security_view.dart
+++ b/lib/pages/settings_security/settings_security_view.dart
@@ -147,6 +147,16 @@ class SettingsSecurityView extends StatelessWidget {
                       style: const TextStyle(fontFamily: 'RobotoMono'),
                     ),
                   ),
+                  // #Pangea
+                  if (capabilities?.m3pidChanges?.enabled != false ||
+                      error != null)
+                    ListTile(
+                      leading: const Icon(Icons.mail_outline_rounded),
+                      trailing: const Icon(Icons.chevron_right_outlined),
+                      title: Text(L10n.of(context).changeEmail),
+                      onTap: () => context.go('/rooms/settings/security/3pid'),
+                    ),
+                  // Pangea#
                   if (capabilities?.mChangePassword?.enabled != false ||
                       error != null)
                     ListTile(