diff --git a/Console/Command/EraseCommand.php b/Console/Command/EraseCommand.php
index f6babe1..6ebc3a6 100644
--- a/Console/Command/EraseCommand.php
+++ b/Console/Command/EraseCommand.php
@@ -77,12 +77,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         try {
             foreach ($entityIds as $entityId) {
-                $this->eraseEntityManagement->process($this->fetchEntity($entityType, $entityId));
+                $this->eraseEntityManagement->process($this->fetchEntity((int)$entityId, $entityType));
                 $progressBar->advance();
             }
             $progressBar->finish();
+            $output->writeln('');
             $output->writeln('<info>Entities has been erased.</info>');
         } catch (LocalizedException $e) {
+            $output->writeln('');
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             $returnCode = Cli::RETURN_FAILURE;
         }
diff --git a/Console/Command/ExportCommand.php b/Console/Command/ExportCommand.php
index ca1bd0c..30a8dbb 100644
--- a/Console/Command/ExportCommand.php
+++ b/Console/Command/ExportCommand.php
@@ -76,17 +76,19 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         try {
             foreach ($entityIds as $entityId) {
-                $exportEntity = $this->fetchEntity($entityId, $entityType);
+                $exportEntity = $this->fetchEntity((int)$entityId, $entityType);
                 $this->exportEntityManagement->export($exportEntity);
                 $files[] = $exportEntity->getFilePath();
                 $progressBar->advance();
             }
             $progressBar->finish();
+            $output->writeln('');
             $output->writeln('<info>Entities data have been exported to:</info>');
             foreach ($files as $file) {
                 $output->writeln($file);
             }
         } catch (Exception $e) {
+            $output->writeln('');
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             $resultCode = Cli::RETURN_FAILURE;
         }
diff --git a/view/frontend/email/erase_pending.html b/view/frontend/email/erase_pending.html
index 3694748..8e192d2 100644
--- a/view/frontend/email/erase_pending.html
+++ b/view/frontend/email/erase_pending.html
@@ -19,7 +19,7 @@
     <tr class="email-summary">
         <td>
             <p>{{trans "We have received a request to erase the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
-            <p>{{trans 'You can cancel the erase within %delay hours by <a href="%account_url">logging into your account</a>.' delay=$delay account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
+            <p>{{trans 'You can cancel the erase within %delay hours by <a href="%account_url">logging into your account</a>.' delay=$delay account_url=$this.getUrl($store,'customer/privacy/settings',[_nosid:1]) |raw}}</p>
         </td>
     </tr>
     <tr class="help-info">
diff --git a/view/frontend/email/erase_pending_guest.html b/view/frontend/email/erase_pending_guest.html
index 62350fb..e971c6b 100644
--- a/view/frontend/email/erase_pending_guest.html
+++ b/view/frontend/email/erase_pending_guest.html
@@ -19,7 +19,7 @@
     <tr class="email-summary">
         <td>
             <p>{{trans "We have received a request to erase the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
-            <p>{{trans 'You can cancel the erase within %delay hours by <a href="%account_url">logging into your account</a>.' delay=$delay account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
+            <p>{{trans 'You can cancel the erase within %delay hours by <a href="%account_url">logging into your account</a>.' delay=$delay account_url=$this.getUrl($store,'sales/guest/form',[_nosid:1]) |raw}}</p>
         </td>
     </tr>
     <tr class="help-info">
diff --git a/view/frontend/email/export_pending.html b/view/frontend/email/export_pending.html
index 327177e..d509b55 100644
--- a/view/frontend/email/export_pending.html
+++ b/view/frontend/email/export_pending.html
@@ -19,7 +19,7 @@
     <tr class="email-summary">
         <td>
             <p>{{trans "We have received a request to export the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
-            <p>{{trans "We will notify you when the export will be ready. The action will be available in your account."}}</p>
+            <p>{{trans "We will notify you when the export will be ready. The action will be available by <a href="%account_url">logging into your account</a>." account_url=$this.getUrl($store,'customer/privacy/settings',[_nosid:1]) |raw}}</p>
         </td>
     </tr>
     <tr class="help-info">
diff --git a/view/frontend/email/export_pending_guest.html b/view/frontend/email/export_pending_guest.html
index 752396b..cf379f2 100644
--- a/view/frontend/email/export_pending_guest.html
+++ b/view/frontend/email/export_pending_guest.html
@@ -19,7 +19,7 @@
     <tr class="email-summary">
         <td>
             <p>{{trans "We have received a request to export the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
-            <p>{{trans "We will notify you when the export will be ready. The action will be available in your account."}}</p>
+            <p>{{trans "We will notify you when the export will be ready. The action will be available by <a href="%account_url">logging into your account</a>." account_url=$this.getUrl($store,'sales/guest/form',[_nosid:1]) |raw}}</p>
         </td>
     </tr>
     <tr class="help-info">
diff --git a/view/frontend/email/export_ready.html b/view/frontend/email/export_ready.html
index 2b44369..3191253 100644
--- a/view/frontend/email/export_ready.html
+++ b/view/frontend/email/export_ready.html
@@ -19,7 +19,7 @@
     <tr class="email-summary">
         <td>
             <p>{{trans "We have received a request to export the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
-            <p>{{trans "The export of you personal data is ready. The action is now available in your account."}}</p>
+            <p>{{trans "The export of you personal data is ready. The action is now available by <a href="%account_url">logging into your account</a>." account_url=$this.getUrl($store,'customer/privacy/settings',[_nosid:1]) |raw}}</p>
         </td>
     </tr>
     <tr class="help-info">
diff --git a/view/frontend/email/export_ready_guest.html b/view/frontend/email/export_ready_guest.html
index 6ad736c..a92864f 100644
--- a/view/frontend/email/export_ready_guest.html
+++ b/view/frontend/email/export_ready_guest.html
@@ -19,7 +19,7 @@
     <tr class="email-summary">
         <td>
             <p>{{trans "We have received a request to export the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
-            <p>{{trans "The export of you personal data is ready. The action is now available in your account."}}</p>
+            <p>{{trans "The export of you personal data is ready. The action is now available by <a href="%account_url">logging into your account</a>." account_url=$this.getUrl($store,'sales/guest/form',[_nosid:1]) |raw}}</p>
         </td>
     </tr>
     <tr class="help-info">