From 76d54971ceb66670980727a15be8346d8bafa085 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Mon, 27 Apr 2026 13:01:03 +0300
Subject: [PATCH] fix test mode clone

---
 lib/templates/clone.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/templates/clone.rb b/lib/templates/clone.rb
index 1f6f2d09..4a33c955 100644
--- a/lib/templates/clone.rb
+++ b/lib/templates/clone.rb
@@ -6,7 +6,7 @@ module Templates
 
     # rubocop:disable Metrics
     def call(original_template, author:, external_id: nil, name: nil, folder_name: nil)
-      template = original_template.account.templates.new
+      template = author.account.templates.new
 
       template.external_id = external_id
       template.shared_link = original_template.shared_link
@@ -16,8 +16,10 @@ module Templates
 
       if folder_name.present?
         template.folder = TemplateFolders.find_or_create_by_name(author, folder_name)
-      else
+      elsif author.account_id == original_template.account_id
         template.folder_id = original_template.folder_id
+      else
+        template.folder = author.account.default_template_folder
       end
 
       template.submitters, template.fields, template.schema, template.preferences =