diff --git a/lib/features/identity_creator/presentation/identity_creator_controller.dart b/lib/features/identity_creator/presentation/identity_creator_controller.dart
index 761d33e30..4e6900dc6 100644
--- a/lib/features/identity_creator/presentation/identity_creator_controller.dart
+++ b/lib/features/identity_creator/presentation/identity_creator_controller.dart
@@ -9,6 +9,7 @@ import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/scheduler.dart';
 import 'package:flutter_image_compress/flutter_image_compress.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
@@ -85,6 +86,7 @@ class IdentityCreatorController extends BaseController {
 
   final GlobalKey htmlKey = GlobalKey();
   final htmlEditorMinHeight = 150;
+  bool isLoadSignatureCompleted = false;
 
   void updateNameIdentity(BuildContext context, String? value) {
     _nameIdentity = value?.trim();
@@ -137,6 +139,7 @@ class IdentityCreatorController extends BaseController {
   @override
   void onClose() {
     log('IdentityCreatorController::onClose():');
+    isLoadSignatureCompleted = false;
     inputNameIdentityFocusNode.dispose();
     inputBccIdentityFocusNode.dispose();
     inputNameIdentityController.dispose();
@@ -665,4 +668,17 @@ class IdentityCreatorController extends BaseController {
       return math.max(responsiveUtils.getSizeScreenWidth(context) * 0.4, IdentityCreatorConstants.maxWidthInlineImageOther);
     }
   }
+
+  void onLoadSignatureCompleted(String? content) {
+    isLoadSignatureCompleted = true;
+    SchedulerBinding.instance.addPostFrameCallback((_) {
+      if (scrollController.hasClients) {
+        scrollController.animateTo(
+          0,
+          duration: const Duration(milliseconds: 200),
+          curve: Curves.fastOutSlowIn
+        );
+      }
+    });
+  }
 }
\ No newline at end of file
diff --git a/lib/features/identity_creator/presentation/identity_creator_view.dart b/lib/features/identity_creator/presentation/identity_creator_view.dart
index d16b922b5..3d9bca237 100644
--- a/lib/features/identity_creator/presentation/identity_creator_view.dart
+++ b/lib/features/identity_creator/presentation/identity_creator_view.dart
@@ -440,7 +440,7 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController>
         shouldEnsureVisible: true,
         hint: '',
         darkMode: false,
-        initialText: initContent,
+        initialText: initContent.isEmpty ? null : initContent,
         customBodyCssStyle: HtmlUtils.customCssStyleHtmlEditor(direction: AppUtils.getCurrentDirection(context)),
       ),
       htmlToolbarOptions: const html_editor_browser.HtmlToolbarOptions(
@@ -450,7 +450,12 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController>
       otherOptions: const html_editor_browser.OtherOptions(height: 200),
       callbacks: html_editor_browser.Callbacks(
         onBeforeCommand: controller.updateContentHtmlEditor,
-        onChangeContent: controller.updateContentHtmlEditor,
+        onChangeContent: (content) {
+          controller.updateContentHtmlEditor(content);
+          if (!controller.isLoadSignatureCompleted) {
+            controller.onLoadSignatureCompleted(content);
+          }
+        },
         onInit: () {
           controller.richTextWebController?.editorController.setFullScreen();
           controller.updateContentHtmlEditor(initContent);