diff --git a/.github/workflows/pr-demo-deploy.yml b/.github/workflows/pr-demo-deploy.yml
index 8963a01e..0cc7f723 100644
--- a/.github/workflows/pr-demo-deploy.yml
+++ b/.github/workflows/pr-demo-deploy.yml
@@ -55,9 +55,9 @@ jobs:
           echo The PR was raised by: ${{ github.event.pull_request.user.login }}
           eval `ssh-agent -s`
           ssh-add - <<< "$SSH_PRIVATE_KEY"
-          echo Creating dokku app ${{ github.head_ref }}
+          echo Creating dokku app ${{ env.SUBDOMAIN }}.pcpink.co.uk/
           ssh dokku@$DOKKU_HOST -C "dokku apps:create ${{ env.SUBDOMAIN }}" | true
-          echo The url will be ${{ github.head_ref }}.pcpink.co.uk
+          echo The url will be ${{ env.SUBDOMAIN }}.pcpink.co.uk
           ssh dokku@$DOKKU_HOST -C "dokku git:initialize ${{ env.SUBDOMAIN }}"
           ssh dokku@$DOKKU_HOST -C "dokku git:set ${{ env.SUBDOMAIN }} deploy-branch ${{ github.head_ref }}"
           # set Stripe test keys as env vars dor dokku/docker
@@ -82,7 +82,7 @@ jobs:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           DOKKU_HOST: ${{ secrets.DOKKU_HOST }}
         run: |
-          echo Visit your pr here: http://${{ github.head_ref }}.pcpink.co.uk
+          echo Visit your pr here: http://${{ env.SUBDOMAIN }}.pcpink.co.uk
       - name: 'Comment PR with web address of application live preview'
         uses: actions/github-script@v3
         if: github.event_name == 'pull_request'
@@ -92,7 +92,7 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: "🙌 Live preview is here: http://${{ github.head_ref }}.pcpink.co.uk"
+              body: "🙌 Live preview is here: http://${{ env.SUBDOMAIN }}.pcpink.co.uk"
             })
 
       - uses: actions/setup-node@v3
diff --git a/subscribie/blueprints/admin/__init__.py b/subscribie/blueprints/admin/__init__.py
index 67390f47..de9f30a9 100644
--- a/subscribie/blueprints/admin/__init__.py
+++ b/subscribie/blueprints/admin/__init__.py
@@ -566,7 +566,7 @@ def edit():
                 plan_requirements.note_to_seller_required = False
 
             plan_requirements.note_to_buyer_message = escape(
-                str(getPlan(form.note_to_buyer_message, index, default="").data)
+                str(getPlan(form.note_to_buyer_message, index, default="").data).strip()
             )
 
             try:
@@ -615,7 +615,29 @@ def edit():
         database.session.commit()  # Save
         flash("Plan(s) updated.")
         return redirect(url_for("admin.edit"))
-    return render_template("admin/edit.html", plans=plans, form=form)
+
+    # Form has validation errors, parse them
+    validation_errors = []
+    plansWithErrors = []
+    for key, value in form.errors.items():
+        # Work out index of error for plan index
+        try:
+            plansWithErrors = [i for i, x in enumerate(value) if x]
+            for planIndex in plansWithErrors:
+                plans[planIndex].has_errors = True
+        except Exception as e:
+            log.error(f"Error parsing plan form errors. {e}")
+        if key == "note_to_buyer_message":
+            key = "Customer note"
+        for sublist in value:
+            for item in sublist:
+                # Ensure item is a string before checking if it contains the error msg
+                if isinstance(item, str):
+                    validation_errors.append(f"{key}: {item}")
+
+    return render_template(
+        "admin/edit.html", plans=plans, form=form, validation_errors=validation_errors
+    )
 
 
 @admin.route("/add", methods=["GET", "POST"])
diff --git a/subscribie/blueprints/admin/templates/admin/edit.html b/subscribie/blueprints/admin/templates/admin/edit.html
index 7b3050fb..2d1f7030 100644
--- a/subscribie/blueprints/admin/templates/admin/edit.html
+++ b/subscribie/blueprints/admin/templates/admin/edit.html
@@ -22,8 +22,8 @@ <h2 class="text-center text-dark mb-3">Edit Plans</h2>
       <div class="alert alert-danger col-md-6 mx-auto">
         <p><strong class="alert-heading">Oops, something is missing. Please take a look at:</strong></p>
         <ul class=errors>
-          {% for error in form.errors %}
-          <li>{{ error }}</li>
+          {% for error in validation_errors %}
+          <li style="list-style: disc;">{{ error }}</li>
           {% endfor %}
         </ul>
       </div>
@@ -51,7 +51,7 @@ <h2 class="text-center text-dark mb-3">Edit Plans</h2>
           <div class="accordion col-lg-8 mx-auto mb-3" id="accordionExample">
             {% for plan in plans %}
             <div class="card">
-              <div class="card-header" id="{{ plan.uuid }}">
+              <div class="card-header{% if plan.has_errors %} alert-danger {% endif %}" id="{{ plan.uuid }}">
                   <button class="btn btn-link btn-block text-left" type="button"  data-toggle="collapse" data-target="#collapse-{{ plan.uuid }}" aria-expanded="false" aria-controls="collapse-{{ plan.uuid }}">{{ plan.title }}</button>
               </div>
               <div id="collapse-{{ plan.uuid }}" class="collapse" aria-labelledby="{{ plan.uuid }}">
@@ -197,8 +197,7 @@ <h2 class="text-center text-dark mb-3">Edit Plans</h2>
                       <div class="form-group ">
                         <div class="form-check">
                           <input type="hidden" class="note_to_seller_required-check" data-id="{{ loop.index0 }}" name="note_to_seller_required-{{ loop.index0 }}" value="no">
-                          <input type="checkbox" value="yes" class="form-check-input toggle" name="note_to_seller_required-{{ loop.index0 }}" id="note_to_seller_required-{{ loop.index0 }}" {% if plan.requirements.note_to_seller_required %} checked
-                            {% endif %}>
+                          <input type="checkbox" value="yes" class="form-check-input toggle" name="note_to_seller_required-{{ loop.index0 }}" id="note_to_seller_required-{{ loop.index0 }}" {% if plan.requirements.note_to_seller_required or plan.requirements.note_to_buyer_message | trim != "" %} checked {% endif %}>
                           <label class="form-check-label font-weight-bolder" for="note_to_seller_required-{{ loop.index0 }}">Require customer note</label>
                         </div>
                         <small class="form-text text-muted">
@@ -208,7 +207,11 @@ <h2 class="text-center text-dark mb-3">Edit Plans</h2>
 
                       <div class="form-group extra_fields" id="message">
                         <label for="note_to_buyer_message-{{ loop.index0 }}" class="col-form-label font-weight-bolder">Message for the customer</label>
-                        <textarea class="form-control" id="note_to_buyer_message-{{ loop.index0 }}" name="note_to_buyer_message-{{ loop.index0 }}">{{ plan.requirements.note_to_buyer_message }} </textarea>
+                        {% if form.note_to_buyer_message.errors[loop.index0] %}
+                            <br />
+                            <em>{{ form.note_to_buyer_message.errors[loop.index0][0] }}</em>
+                        {% endif %}
+                        <textarea class="form-control" id="note_to_buyer_message-{{ loop.index0 }}" name="note_to_buyer_message-{{ loop.index0 }}" maxlength="500" {% if form.note_to_buyer_message.errors[loop.index0] %} style="border: 3px solid red;" {% endif %}>{{ plan.requirements.note_to_buyer_message }}</textarea>
                         <small class="form-text text-muted">
                           This message will be shown during checkout to the customer
                         </small>