diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index 1f2ca93ce2..c9ce8115b2 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -37,10 +37,10 @@ jobs:
       with:
         ruby-version: '3.0'
         bundler-cache: true
-        
-    ## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV 
+
+    ## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV
     ## /home/runner/runners/2.301.1/externals/node12/bin/node: --openssl-legacy-provider is not allowed in NODE_OPTIONS
- 
+
     # Install Node
     - uses: actions/setup-node@v3
       with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 946898ba6a..a9deb1e87a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -117,3 +117,4 @@ For more detailed explanation, please refer to this video : https://www.youtube.
 
 - Added scss files to EditorConfig
 - Change csv file name for statistics from 'Completed' to 'Created'
+- Added error message and updated saving message for plan writing session to improve user experience
diff --git a/Gemfile.lock b/Gemfile.lock
index 0576e813b3..4347f16412 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -297,8 +297,6 @@ GEM
     no_proxy_fix (0.1.2)
     nokogiri (1.14.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
-      racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -524,7 +522,6 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
-  x86_64-linux
 
 DEPENDENCIES
   activerecord_json_validator
diff --git a/app/views/answers/_status.html.erb b/app/views/answers/_status.html.erb
index bf893365a2..9d25e9ef83 100644
--- a/app/views/answers/_status.html.erb
+++ b/app/views/answers/_status.html.erb
@@ -2,8 +2,24 @@
 <!--
   Partial for handling the answer status (e.g. saving, error-saving, data-status)
 -->
-<span class="label label-info status" style="display:none;" data-status="saving"><%= _('Saving...') %></span>
-<span class="label label-warning status" style="display: none;" data-status="error-saving"></span>
+<%
+  helpdesk_email = Rails.configuration.x.organisation.helpdesk_email
+  email_subject = _('Plan writing error related to %{tool_name}') %{ :tool_name => tool_name }
+%>
+<span class="label label-warning status" style="display:none;" data-status="saving">
+  <%= _("Saving...Please do not refresh or go to another page!") %>
+  <br><br>
+  <%= sanitize(_("If you stuck on this message, please save your plan to a separate file and contact us at %{helpdesk_email} .") % {
+      helpdesk_email: mail_to(helpdesk_email, helpdesk_email,subject: email_subject)
+    }) %>
+</span>
+<span class="label label-danger status" style="display: none;" data-status="error-saving">
+<%= sanitize(_("Sorry, we had trouble saving your data. Please contact us at %{helpdesk_email} .") % {
+      helpdesk_email: mail_to(helpdesk_email, helpdesk_email,subject: email_subject)
+    }) %>
+<br><br>
+<%= _("Save your plan content to a separate file now. You will LOSE them after refreshing or closing this page.") %>
+</span>
 <% if answer.answered? %>
     <span class="label label-info status" data-status="saved-at">
       <%= _('Answered')%> <time class="timeago" datetime="<%= answer.updated_at.iso8601 %>"></time>