diff --git a/.lycheeignore b/.lycheeignore
index 3426f46..27b055d 100644
--- a/.lycheeignore
+++ b/.lycheeignore
@@ -87,6 +87,7 @@ https://github.com/gjwgit/myapp/blob/main/README.md
 https://server/POD_NAME/APP_NAME/data/FILE_PATH
 https://host/
 https://pods.au/me/app/data
+https://pub.dev/documentation/solidui/latest/solidui/SolidScaffold-class.html
 
 # 20260605 gjw Failing solid servers
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f262e3..2524e31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,12 +16,17 @@ The package is available from
 
 ## 1.1 Consolidate Android Login
 
++ Sync profile visibility state across sessions and browser refreshes #301
+[1.0.14 20260626 amogh]
++ Fix unhandled keyring lock exceptions in login and auto-login #350
+[1.0.13 20260626 amogh]
 + Migrate TEMPLATE from solidpod to solidui [1.0.15 20260629 tonypioneer]
 + Sync profile visibility state across sessions and browser refreshes #301 [1.0.14 20260626 amogh]
 + Fix unhandled keyring lock exceptions in login and auto-login #350 [1.0.13 20260626 amogh]
 + Show animation while obtaining key [1.0.12 20260626 anushkavidanage]
 + REGISTER popup. Change PASSWD from profile [1.0.11 20260623 tonypioneer]
-+ Add account and change password dialogs (CSS v7+) [1.0.10 20260617 anushkavidanage]
++ Add account and change password dialogs (CSS v7+)
+[1.0.10 20260617 anushkavidanage]
 + Support writing large files to external pod [1.0.9 20260618 tonypioneer]
 + Allow different version string colours appbar/menu [1.0.8 20260614 gjw]
 + Bump solid_auth token refresh fix [1.0.7 20260612 gjw]
diff --git a/lib/src/widgets/create_account_dialog.dart b/lib/src/widgets/create_account_dialog.dart
index d17fdac..336cc61 100644
--- a/lib/src/widgets/create_account_dialog.dart
+++ b/lib/src/widgets/create_account_dialog.dart
@@ -119,6 +119,8 @@ Future<bool> createAccountPopup(
 
   final outerContext = context;
 
+  BuildContext? dialogContext;
+
   // Tracks whether the account was actually created, so callers can react
   // (e.g. pre-fill the login form with the new email).
 
@@ -176,8 +178,9 @@ Future<bool> createAccountPopup(
       bgColor = Colors.red;
       duration = const Duration(seconds: 7);
     } finally {
-      if (popDialog && context.mounted) {
-        Navigator.pop(context);
+      final dialogCtx = dialogContext;
+      if (popDialog && dialogCtx != null && dialogCtx.mounted) {
+        Navigator.pop(dialogCtx);
       }
       if (outerContext.mounted) {
         showSnackBar(outerContext, msg, bgColor, duration: duration);
@@ -225,14 +228,17 @@ Future<bool> createAccountPopup(
   if (context.mounted) {
     await showDialog(
       context: context,
-      builder: (context) => AlertDialog(
-        content: SingleChildScrollView(
-          child: createAccountForm,
-        ),
-        contentPadding: EdgeInsets.zero,
-        backgroundColor: Colors.transparent,
-        elevation: 0,
-      ),
+      builder: (builderContext) {
+        dialogContext = builderContext;
+        return AlertDialog(
+          content: SingleChildScrollView(
+            child: createAccountForm,
+          ),
+          contentPadding: EdgeInsets.zero,
+          backgroundColor: Colors.transparent,
+          elevation: 0,
+        );
+      },
     );
   }