diff --git a/Gemfile.lock b/Gemfile.lock
index b9151ec0..7e35ba9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -298,7 +298,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -311,7 +311,7 @@ GEM
     method_source (1.1.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
+    mini_portile2 (2.8.8)
     minitest (5.25.1)
     msgpack (1.7.3)
     multi_json (1.15.0)
@@ -330,12 +330,12 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7)
+    nokogiri (1.16.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.7-aarch64-linux)
+    nokogiri (1.16.8-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.8-x86_64-linux)
       racc (~> 1.4)
     oj (3.16.6)
       bigdecimal (>= 3.0)
@@ -400,9 +400,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
diff --git a/app/controllers/api/submissions_controller.rb b/app/controllers/api/submissions_controller.rb
index 6337a123..e0de0b4c 100644
--- a/app/controllers/api/submissions_controller.rb
+++ b/app/controllers/api/submissions_controller.rb
@@ -78,7 +78,9 @@ module Api
 
       submissions.each do |submission|
         submission.submitters.each do |submitter|
-          ProcessSubmitterCompletionJob.perform_async('submitter_id' => submitter.id) if submitter.completed_at?
+          next unless submitter.completed_at?
+
+          ProcessSubmitterCompletionJob.perform_async('submitter_id' => submitter.id, 'send_invitation_email' => false)
         end
       end
 
diff --git a/app/controllers/submissions_archived_controller.rb b/app/controllers/submissions_archived_controller.rb
index c13745ff..3c3f49b6 100644
--- a/app/controllers/submissions_archived_controller.rb
+++ b/app/controllers/submissions_archived_controller.rb
@@ -8,6 +8,9 @@ class SubmissionsArchivedController < ApplicationController
     @submissions = @submissions.where.not(archived_at: nil)
                                .or(@submissions.where.not(templates: { archived_at: nil }))
                                .preload(:created_by_user, template: :author)
+
+    @submissions = @submissions.preload(:template_accesses) unless current_user.role.in?(%w[admin superadmin])
+
     @submissions = Submissions.search(@submissions, params[:q], search_template: true)
     @submissions = Submissions::Filter.call(@submissions, current_user, params)
 
diff --git a/app/controllers/submissions_dashboard_controller.rb b/app/controllers/submissions_dashboard_controller.rb
index 164e893a..f71e10b5 100644
--- a/app/controllers/submissions_dashboard_controller.rb
+++ b/app/controllers/submissions_dashboard_controller.rb
@@ -10,6 +10,8 @@ class SubmissionsDashboardController < ApplicationController
                                .where(templates: { archived_at: nil })
                                .preload(:created_by_user, template: :author)
 
+    @submissions = @submissions.preload(:template_accesses) unless current_user.role.in?(%w[admin superadmin])
+
     @submissions = Submissions.search(@submissions, params[:q], search_template: true)
     @submissions = Submissions::Filter.call(@submissions, current_user, params)
 
diff --git a/app/controllers/submitters_autocomplete_controller.rb b/app/controllers/submitters_autocomplete_controller.rb
index 37b00c6e..e86e129e 100644
--- a/app/controllers/submitters_autocomplete_controller.rb
+++ b/app/controllers/submitters_autocomplete_controller.rb
@@ -9,7 +9,8 @@ class SubmittersAutocompleteController < ApplicationController
   def index
     submitters = search_submitters(@submitters)
 
-    values = submitters.limit(LIMIT).group(SELECT_COLUMNS.join(', ')).pluck(SELECT_COLUMNS.join(', '))
+    arel_columns = SELECT_COLUMNS.map { |col| Submitter.arel_table[col] }
+    values = submitters.limit(LIMIT).group(arel_columns).pluck(arel_columns)
 
     attrs = values.map { |row| SELECT_COLUMNS.zip(row).to_h }
     attrs = attrs.uniq { |e| e[params[:field]] } if params[:field].present?
diff --git a/app/controllers/template_folders_controller.rb b/app/controllers/template_folders_controller.rb
index 87ce435c..dd7010bb 100644
--- a/app/controllers/template_folders_controller.rb
+++ b/app/controllers/template_folders_controller.rb
@@ -4,7 +4,7 @@ class TemplateFoldersController < ApplicationController
   load_and_authorize_resource :template_folder
 
   def show
-    @templates = @template_folder.templates.active.preload(:author).order(id: :desc)
+    @templates = @template_folder.templates.active.preload(:author, :template_accesses).order(id: :desc)
     @templates = Templates.search(@templates, params[:q])
 
     @pagy, @templates = pagy(@templates, limit: 12)
diff --git a/app/controllers/templates_archived_controller.rb b/app/controllers/templates_archived_controller.rb
index 1f0f1752..f75e83a1 100644
--- a/app/controllers/templates_archived_controller.rb
+++ b/app/controllers/templates_archived_controller.rb
@@ -4,7 +4,7 @@ class TemplatesArchivedController < ApplicationController
   load_and_authorize_resource :template, parent: false
 
   def index
-    @templates = @templates.where.not(archived_at: nil).preload(:author, :folder).order(id: :desc)
+    @templates = @templates.where.not(archived_at: nil).preload(:author, :folder, :template_accesses).order(id: :desc)
     @templates = Templates.search(@templates, params[:q])
 
     @pagy, @templates = pagy(@templates, limit: 12)
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
index 306476b2..1b52c23b 100644
--- a/app/controllers/templates_controller.rb
+++ b/app/controllers/templates_controller.rb
@@ -22,6 +22,8 @@ class TemplatesController < ApplicationController
                     submissions.order(id: :desc)
                   end
 
+    submissions = submissions.preload(:template_accesses) unless current_user.role.in?(%w[admin superadmin])
+
     @pagy, @submissions = pagy(submissions.preload(submitters: :start_form_submission_events))
   rescue ActiveRecord::RecordNotFound
     redirect_to root_path
@@ -109,7 +111,7 @@ class TemplatesController < ApplicationController
   def template_params
     params.require(:template).permit(
       :name,
-      { schema: [%i[attachment_uuid name]],
+      { schema: [[:attachment_uuid, :name, { conditions: [%i[field_uuid value action operation]] }]],
         submitters: [%i[name uuid is_requester linked_to_uuid invite_by_uuid email]],
         fields: [[:uuid, :submitter_uuid, :name, :type,
                   :required, :readonly, :default_value,
diff --git a/app/controllers/templates_dashboard_controller.rb b/app/controllers/templates_dashboard_controller.rb
index be9dea75..3a6a66df 100644
--- a/app/controllers/templates_dashboard_controller.rb
+++ b/app/controllers/templates_dashboard_controller.rb
@@ -45,7 +45,7 @@ class TemplatesDashboardController < ApplicationController
   end
 
   def filter_templates(templates)
-    rel = templates.active.preload(:author).order(id: :desc)
+    rel = templates.active.preload(:author, :template_accesses).order(id: :desc)
 
     if params[:q].blank?
       if Docuseal.multitenant? && !current_account.testing?
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 80767193..d11e9ba8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -34,6 +34,8 @@ class UsersController < ApplicationController
       @user = existing_user
     end
 
+    @user.role = User::ADMIN_ROLE unless role_valid?(@user.role)
+
     if @user.save
       UserMailer.invitation_email(@user).deliver_later!
 
diff --git a/app/javascript/form.js b/app/javascript/form.js
index 604d06a4..f9583da6 100644
--- a/app/javascript/form.js
+++ b/app/javascript/form.js
@@ -15,6 +15,7 @@ safeRegisterElement('submission-form', class extends HTMLElement {
     this.app = createApp(Form, {
       submitter: JSON.parse(this.dataset.submitter),
       inviteSubmitters: JSON.parse(this.dataset.inviteSubmitters),
+      schema: JSON.parse(this.dataset.schema),
       canSendEmail: this.dataset.canSendEmail === 'true',
       previousSignatureValue: this.dataset.previousSignatureValue,
       goToLast: this.dataset.goToLast === 'true',
diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue
index f3d363ab..f8c4031d 100644
--- a/app/javascript/submission_form/form.vue
+++ b/app/javascript/submission_form/form.vue
@@ -15,8 +15,9 @@
   />
   <FieldAreas
     :steps="readonlyConditionalFields.map((e) => [e])"
-    :values="readonlyConditionalFields.reduce((acc, f) => { acc[f.uuid] = f.default_value; return acc }, {})"
+    :values="readonlyConditionalFields.reduce((acc, f) => { acc[f.uuid] = (values[f.uuid] || f.default_value); return acc }, {})"
     :submitter="submitter"
+    :attachments-index="attachmentsIndex"
     :submittable="false"
   />
   <FormulaFieldAreas
@@ -651,6 +652,11 @@ export default {
       required: false,
       default: null
     },
+    schema: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
     attachments: {
       type: Array,
       required: false,
@@ -840,6 +846,21 @@ export default {
     isMobile () {
       return /android|iphone|ipad/i.test(navigator.userAgent)
     },
+    attachmentConditionsIndex () {
+      return this.schema.reduce((acc, item) => {
+        if (item.conditions?.length) {
+          if (item.conditions.every((c) => this.fieldsUuidIndex[c.field_uuid])) {
+            acc[item.attachment_uuid] = this.checkFieldConditions(item)
+          } else {
+            acc[item.attachment_uuid] = true
+          }
+        } else {
+          acc[item.attachment_uuid] = true
+        }
+
+        return acc
+      }, {})
+    },
     emptyValueRequiredStep () {
       return this.stepFields.find((fields, index) => {
         return fields.some((f) => {
@@ -920,7 +941,7 @@ export default {
       return this.currentStepFields[0]
     },
     readonlyConditionalFields () {
-      return this.fields.filter((f) => f.readonly && f.conditions?.length && this.checkFieldConditions(f))
+      return this.fields.filter((f) => f.readonly && f.conditions?.length && this.checkFieldConditions(f) && this.checkFieldDocumentsConditions(f))
     },
     stepFields () {
       const verificationFields = []
@@ -942,7 +963,7 @@ export default {
       return sortedFields.reduce((acc, f) => {
         const prevStep = acc[acc.length - 1]
 
-        if (this.checkFieldConditions(f)) {
+        if (this.checkFieldConditions(f) && this.checkFieldDocumentsConditions(f)) {
           if (f.type === 'checkbox' && Array.isArray(prevStep) && prevStep[0].type === 'checkbox' && !f.description) {
             prevStep.push(f)
           } else {
@@ -975,6 +996,23 @@ export default {
       if (isEmpty(value) && this.currentStep > 0) {
         this.currentStep -= 1
       }
+    },
+    attachmentConditionsIndex: {
+      deep: true,
+      immediate: true,
+      handler (value) {
+        this.$nextTick(() => {
+          const root = this.$root.$el.parentNode.getRootNode()
+
+          for (const key in value) {
+            const doc = root.querySelector(`[id="document-${key}"`)
+
+            if (doc) {
+              doc.classList.toggle('hidden', !value[key])
+            }
+          }
+        })
+      }
     }
   },
   beforeUnmount () {
@@ -1056,6 +1094,15 @@ export default {
     onOrientationChange (event) {
       this.orientation = event.target.type
     },
+    checkFieldDocumentsConditions (field) {
+      if (field.areas?.length) {
+        return field.areas.some((area) => {
+          return this.attachmentConditionsIndex[area.attachment_uuid]
+        })
+      } else {
+        return true
+      }
+    },
     checkFieldConditions (field) {
       if (field.conditions?.length) {
         const result = field.conditions.reduce((acc, cond) => {
diff --git a/app/javascript/submission_form/i18n.js b/app/javascript/submission_form/i18n.js
index bbe65ad5..3db90855 100644
--- a/app/javascript/submission_form/i18n.js
+++ b/app/javascript/submission_form/i18n.js
@@ -780,7 +780,7 @@ const pt = {
   verify_id: 'Verificar ID',
   identity_verification: 'Verificação de identidade',
   complete: 'Completar',
-  preencher_todos_os_campos_obrigatórios_para_concluir: 'Preencher todos os campos obrigatórios para concluir',
+  fill_all_required_fields_to_complete: 'Preencher todos os campos obrigatórios para concluir',
   sign_and_complete: 'Assinar e Completar',
   invite: 'Convidar',
   email: 'E-mail',
@@ -975,7 +975,7 @@ const nl = {
   verify_id: 'Verifiëren ID',
   identity_verification: 'Identiteitsverificatie',
   complete: 'Voltooien',
-  vul_alle_verplichte_velden_in_om_te_voltooien: 'Vul alle verplichte velden in om te voltooien',
+  fill_all_required_fields_to_complete: 'Vul alle verplichte velden in om te voltooien',
   sign_and_complete: 'Ondertekenen en voltooien',
   invite: 'Uitnodigen',
   email: 'E-mail',
diff --git a/app/javascript/submission_form/phone_data.js b/app/javascript/submission_form/phone_data.js
index de8ea83b..36d5c054 100644
--- a/app/javascript/submission_form/phone_data.js
+++ b/app/javascript/submission_form/phone_data.js
@@ -1,5 +1,6 @@
 export default [
   [
+    'US',
     'United States',
     '1',
     '🇺🇸',
@@ -14,60 +15,70 @@ export default [
     ]
   ],
   [
+    'AF',
     'Afghanistan',
     '93',
     '🇦🇫',
     ['Kabul']
   ],
   [
+    'AX',
     'Aland Islands',
     '358',
     '🇦🇽',
     ['Mariehamn']
   ],
   [
+    'AL',
     'Albania',
     '355',
     '🇦🇱',
     ['Tirane']
   ],
   [
+    'DZ',
     'Algeria',
     '213',
     '🇩🇿',
     ['Algiers']
   ],
   [
+    'AS',
     'American Samoa',
     '1684',
     '🇦🇸',
     ['Pago_Pago']
   ],
   [
+    'AD',
     'Andorra',
     '376',
     '🇦🇩',
     ['Andorra']
   ],
   [
+    'AO',
     'Angola',
     '244',
     '🇦🇴',
     ['Luanda']
   ],
   [
+    'AI',
     'Anguilla',
     '1264',
     '🇦🇮',
     ['Anguilla']
   ],
   [
+    'AG',
     'Antigua and Barbuda',
     '1268',
     '🇦🇬',
     ['Antigua']
   ],
   [
+    'AR',
     'Argentina',
     '54',
     '🇦🇷',
@@ -87,18 +98,21 @@ export default [
     ]
   ],
   [
+    'AM',
     'Armenia',
     '374',
     '🇦🇲',
     ['Yerevan']
   ],
   [
+    'AW',
     'Aruba',
     '297',
     '🇦🇼',
     ['Aruba']
   ],
   [
+    'AU',
     'Australia',
     '61',
     '🇦🇺',
@@ -118,90 +132,105 @@ export default [
     ]
   ],
   [
+    'AT',
     'Austria',
     '43',
     '🇦🇹',
     ['Vienna']
   ],
   [
+    'AZ',
     'Azerbaijan',
     '994',
     '🇦🇿',
     ['Baku']
   ],
   [
+    'BS',
     'Bahamas',
     '1242',
     '🇧🇸',
     ['Nassau']
   ],
   [
+    'BH',
     'Bahrain',
     '973',
     '🇧🇭',
     ['Bahrain']
   ],
   [
+    'BD',
     'Bangladesh',
     '880',
     '🇧🇩',
     ['Dhaka']
   ],
   [
+    'BB',
     'Barbados',
     '1246',
     '🇧🇧',
     ['Barbados']
   ],
   [
+    'BE',
     'Belgium',
     '32',
     '🇧🇪',
     ['Brussels']
   ],
   [
+    'BZ',
     'Belize',
     '501',
     '🇧🇿',
     ['Belize']
   ],
   [
+    'BJ',
     'Benin',
     '229',
     '🇧🇯',
     ['Porto-Novo']
   ],
   [
+    'BM',
     'Bermuda',
     '1441',
     '🇧🇲',
     ['Bermuda']
   ],
   [
+    'BT',
     'Bhutan',
     '975',
     '🇧🇹',
     ['Thimphu']
   ],
   [
+    'BO',
     'Bolivia',
     '591',
     '🇧🇴',
     ['La_Paz']
   ],
   [
+    'BA',
     'Bosnia and Herzegovina',
     '387',
     '🇧🇦',
     ['Sarajevo']
   ],
   [
+    'BW',
     'Botswana',
     '267',
     '🇧🇼',
     ['Gaborone']
   ],
   [
+    'BR',
     'Brazil',
     '55',
     '🇧🇷',
@@ -225,48 +254,56 @@ export default [
     ]
   ],
   [
+    'IO',
     'British Indian Ocean Territory',
     '246',
     '🇮🇴',
     ['Chagos']
   ],
   [
+    'BN',
     'Brunei Darussalam',
     '673',
     '🇧🇳',
     ['Brunei']
   ],
   [
+    'BG',
     'Bulgaria',
     '359',
     '🇧🇬',
     ['Sofia']
   ],
   [
+    'BF',
     'Burkina Faso',
     '226',
     '🇧🇫',
     ['Ouagadougou']
   ],
   [
+    'BI',
     'Burundi',
     '257',
     '🇧🇮',
     ['Bujumbura']
   ],
   [
+    'KH',
     'Cambodia',
     '855',
     '🇰🇭',
     ['Phnom_Penh']
   ],
   [
+    'CM',
     'Cameroon',
     '237',
     '🇨🇲',
     ['Douala']
   ],
   [
+    'CA',
     'Canada',
     '1',
     '🇨🇦',
@@ -302,252 +339,294 @@ export default [
     ]
   ],
   [
+    'CV',
     'Cape Verde',
     '238',
     '🇨🇻',
     ['Cape_Verde']
   ],
   [
+    'KY',
     'Cayman Islands',
     '1345',
     '🇰🇾',
     ['Cayman']
   ],
   [
+    'TD',
     'Chad',
     '235',
     '🇹🇩',
     ['Ndjamena']
   ],
   [
+    'CL',
     'Chile',
     '56',
     '🇨🇱',
     ['Punta_Arenas', 'Santiago', 'Easter']
   ],
   [
+    'CN',
     'China',
     '86',
     '🇨🇳',
     ['Shanghai', 'Urumqi']
   ],
   [
+    'CX',
     'Christmas Island',
     '61',
     '🇨🇽',
     ['Christmas']
   ],
   [
+    'CC',
     'Cocos (Keeling) Islands',
     '61',
     '🇨🇨',
     ['Cocos']
   ],
   [
+    'CO',
     'Colombia',
     '57',
     '🇨🇴',
     ['Bogota']
   ],
   [
+    'KM',
     'Comoros',
     '269',
     '🇰🇲',
     ['Comoro']
   ],
   [
+    'CD',
     'Congo, The Democratic Republic of the',
     '243',
     '🇨🇩',
     ['Kinshasa', 'Lubumbashi']
   ],
   [
+    'CK',
     'Cook Islands',
     '682',
     '🇨🇰',
     ['Rarotonga']
   ],
   [
+    'CR',
     'Costa Rica',
     '506',
     '🇨🇷',
     ['Costa_Rica']
   ],
   [
+    'CI',
     "Côte d'Ivoire",
     '225',
     '🇨🇮',
     ['Abidjan']
   ],
   [
+    'HR',
     'Croatia',
     '385',
     '🇭🇷',
     ['Zagreb']
   ],
   [
+    'CY',
     'Cyprus',
     '357',
     '🇨🇾',
     ['Nicosia', 'Famagusta']
   ],
   [
+    'CZ',
     'Czech Republic',
     '420',
     '🇨🇿',
     ['Prague']
   ],
   [
+    'DK',
     'Denmark',
     '45',
     '🇩🇰',
     ['Copenhagen']
   ],
   [
+    'DJ',
     'Djibouti',
     '253',
     '🇩🇯',
     ['Djibouti']
   ],
   [
+    'DM',
     'Dominica',
     '1767',
     '🇩🇲',
     ['Dominica']
   ],
   [
+    'DO',
     'Dominican Republic',
     '1849',
     '🇩🇴',
     ['Santo_Domingo']
   ],
   [
+    'EC',
     'Ecuador',
     '593',
     '🇪🇨',
     ['Guayaquil', 'Galapagos']
   ],
   [
+    'EG',
     'Egypt',
     '20',
     '🇪🇬',
     ['Cairo']
   ],
   [
+    'SV',
     'El Salvador',
     '503',
     '🇸🇻',
     ['El_Salvador']
   ],
   [
+    'GQ',
     'Equatorial Guinea',
     '240',
     '🇬🇶',
     ['Malabo']
   ],
   [
+    'ER',
     'Eritrea',
     '291',
     '🇪🇷',
     ['Asmara']
   ],
   [
+    'EE',
     'Estonia',
     '372',
     '🇪🇪',
     ['Tallinn']
   ],
   [
+    'ET',
     'Ethiopia',
     '251',
     '🇪🇹',
     ['Addis_Ababa']
   ],
   [
+    'FK',
     'Falkland Islands (Malvinas)',
     '500',
     '🇫🇰',
     ['Stanley']
   ],
   [
+    'FO',
     'Faroe Islands',
     '298',
     '🇫🇴',
     ['Faroe']
   ],
   [
+    'FJ',
     'Fiji',
     '679',
     '🇫🇯',
     ['Fiji']
   ],
   [
+    'FI',
     'Finland',
     '358',
     '🇫🇮',
     ['Helsinki']
   ],
   [
+    'FR',
     'France',
     '33',
     '🇫🇷',
     ['Paris']
   ],
   [
+    'GF',
     'French Guiana',
     '594',
     '🇬🇫',
     ['Cayenne']
   ],
   [
+    'PF',
     'French Polynesia',
     '689',
     '🇵🇫',
     ['Tahiti', 'Marquesas', 'Gambier']
   ],
   [
+    'GA',
     'Gabon',
     '241',
     '🇬🇦',
     ['Libreville']
   ],
   [
+    'GM',
     'Gambia',
     '220',
     '🇬🇲',
     ['Banjul']
   ],
   [
+    'GE',
     'Georgia',
     '995',
     '🇬🇪',
     ['Tbilisi']
   ],
   [
+    'DE',
     'Germany',
     '49',
     '🇩🇪',
     ['Berlin', 'Busingen']
   ],
   [
+    'GH',
     'Ghana',
     '233',
     '🇬🇭',
     ['Accra']
   ],
   [
+    'GI',
     'Gibraltar',
     '350',
     '🇬🇮',
     ['Gibraltar']
   ],
   [
+    'GR',
     'Greece',
     '30',
     '🇬🇷',
     ['Athens']
   ],
   [
+    'GL',
     'Greenland',
     '299',
     '🇬🇱',
@@ -559,85 +638,98 @@ export default [
     ]
   ],
   [
+    'GD',
     'Grenada',
     '1473',
     '🇬🇩',
     ['Grenada']
   ],
   [
+    'GP',
     'Guadeloupe',
     '590',
     '🇬🇵',
     ['Guadeloupe']
   ],
   [
+    'GU',
     'Guam',
     '1671',
     '🇬🇺',
     ['Guam']
   ],
   [
+    'GT',
     'Guatemala',
     '502',
     '🇬🇹',
     ['Guatemala']
   ],
   [
+    'GN',
     'Guinea',
     '224',
     '🇬🇳',
     ['Conakry']
   ],
   [
+    'GW',
     'Guinea-Bissau',
     '245',
     '🇬🇼',
     ['Bissau']
   ],
   [
+    'GY',
     'Guyana',
     '592',
     '🇬🇾',
     ['Guyana']
   ],
   [
+    'HT',
     'Haiti',
     '509',
     '🇭🇹',
     ['Port-au-Prince']
   ],
   [
+    'HN',
     'Honduras',
     '504',
     '🇭🇳',
     ['Tegucigalpa']
   ],
   [
+    'HK',
     'Hong Kong',
     '852',
     '🇭🇰',
     ['Hong_Kong']
   ],
   [
+    'HU',
     'Hungary',
     '36',
     '🇭🇺',
     ['Budapest']
   ],
-
   [
+    'IS',
     'Iceland',
     '354',
     '🇮🇸',
     ['Reykjavik']
   ],
   [
+    'IN',
     'India',
     '91',
     '🇮🇳',
     ['Kolkata']
   ],
   [
+    'ID',
     'Indonesia',
     '62',
     '🇮🇩',
@@ -649,60 +741,70 @@ export default [
     ]
   ],
   [
+    'IQ',
     'Iraq',
     '964',
     '🇮🇶',
     ['Baghdad']
   ],
   [
+    'IE',
     'Ireland',
     '353',
     '🇮🇪',
     ['Dublin']
   ],
   [
+    'IM',
     'Isle of Man',
     '44',
     '🇮🇲',
     ['Isle_of_Man']
   ],
   [
+    'IL',
     'Israel',
     '972',
     '🇮🇱',
     ['Jerusalem']
   ],
   [
+    'IT',
     'Italy',
     '39',
     '🇮🇹',
     ['Rome']
   ],
   [
+    'JM',
     'Jamaica',
     '1876',
     '🇯🇲',
     ['Jamaica']
   ],
   [
+    'JP',
     'Japan',
     '81',
     '🇯🇵',
     ['Tokyo']
   ],
   [
+    'JE',
     'Jersey',
     '44',
     '🇯🇪',
     ['Jersey']
   ],
   [
+    'JO',
     'Jordan',
     '962',
     '🇯🇴',
     ['Amman']
   ],
   [
+    'KZ',
     'Kazakhstan',
     '7',
     '🇰🇿',
@@ -715,162 +817,190 @@ export default [
     ]
   ],
   [
+    'KE',
     'Kenya',
     '254',
     '🇰🇪',
     ['Nairobi']
   ],
   [
+    'KI',
     'Kiribati',
     '686',
     '🇰🇮',
     ['Tarawa', 'Enderbury', 'Kiritimati']
   ],
   [
+    'KR',
     'South Korea',
     '82',
     '🇰🇷',
     ['Seoul']
   ],
   [
+    'KW',
     'Kuwait',
     '965',
     '🇰🇼',
     ['Kuwait']
   ],
   [
+    'KG',
     'Kyrgyzstan',
     '996',
     '🇰🇬',
     ['Bishkek']
   ],
   [
+    'LA',
     'Laos',
     '856',
     '🇱🇦',
     ['Vientiane']
   ],
   [
+    'LV',
     'Latvia',
     '371',
     '🇱🇻',
     ['Riga']
   ],
   [
+    'LB',
     'Lebanon',
     '961',
     '🇱🇧',
     ['Beirut']
   ],
   [
+    'LS',
     'Lesotho',
     '266',
     '🇱🇸',
     ['Maseru']
   ],
   [
+    'LR',
     'Liberia',
     '231',
     '🇱🇷',
     ['Monrovia']
   ],
   [
+    'LI',
     'Liechtenstein',
     '423',
     '🇱🇮',
     ['Vaduz']
   ],
   [
+    'LT',
     'Lithuania',
     '370',
     '🇱🇹',
     ['Vilnius']
   ],
   [
+    'LU',
     'Luxembourg',
     '352',
     '🇱🇺',
     ['Luxembourg']
   ],
   [
+    'MO',
     'Macao',
     '853',
     '🇲🇴',
     ['Macau']
   ],
   [
+    'MK',
     'North Macedonia',
     '389',
     '🇲🇰',
     ['Skopje']
   ],
   [
+    'MG',
     'Madagascar',
     '261',
     '🇲🇬',
     ['Antananarivo']
   ],
   [
+    'MW',
     'Malawi',
     '265',
     '🇲🇼',
     ['Blantyre']
   ],
   [
+    'MY',
     'Malaysia',
     '60',
     '🇲🇾',
     ['Kuala_Lumpur', 'Kuching']
   ],
   [
+    'MV',
     'Maldives',
     '960',
     '🇲🇻',
     ['Maldives']
   ],
+
   [
+    'ML',
     'Mali',
     '223',
     '🇲🇱',
     ['Bamako']
   ],
   [
+    'MT',
     'Malta',
     '356',
     '🇲🇹',
     ['Malta']
   ],
   [
+    'MH',
     'Marshall Islands',
     '692',
     '🇲🇭',
     ['Majuro', 'Kwajalein']
   ],
   [
+    'MQ',
     'Martinique',
     '596',
     '🇲🇶',
     ['Martinique']
   ],
   [
+    'MR',
     'Mauritania',
     '222',
     '🇲🇷',
     ['Nouakchott']
   ],
   [
+    'MU',
     'Mauritius',
     '230',
     '🇲🇺',
     ['Mauritius']
   ],
   [
+    'YT',
     'Mayotte',
     '262',
     '🇾🇹',
     ['Mayotte']
   ],
   [
+    'MX',
     'Mexico',
     '52',
     '🇲🇽',
@@ -889,476 +1019,553 @@ export default [
     ]
   ],
   [
+    'FM',
     'Micronesia, Federated States of',
     '691',
     '🇫🇲',
     ['Chuuk', 'Pohnpei', 'Kosrae']
   ],
-
   [
+    'MD',
     'Moldova',
     '373',
     '🇲🇩',
     ['Chisinau']
   ],
   [
+    'MC',
     'Monaco',
     '377',
     '🇲🇨',
     ['Monaco']
   ],
   [
+    'MN',
     'Mongolia',
     '976',
     '🇲🇳',
     ['Ulaanbaatar', 'Hovd', 'Choibalsan']
   ],
   [
+    'ME',
     'Montenegro',
     '382',
     '🇲🇪',
     ['Podgorica']
   ],
   [
+    'MS',
     'Montserrat',
     '1664',
     '🇲🇸',
     ['Montserrat']
   ],
   [
+    'MA',
     'Morocco',
     '212',
     '🇲🇦',
     ['Casablanca']
   ],
   [
+    'MZ',
     'Mozambique',
     '258',
     '🇲🇿',
     ['Maputo']
   ],
   [
+    'NA',
     'Namibia',
     '264',
     '🇳🇦',
     ['Windhoek']
   ],
   [
+    'NR',
     'Nauru',
     '674',
     '🇳🇷',
     ['Nauru']
   ],
   [
+    'NP',
     'Nepal',
     '977',
     '🇳🇵',
     ['Kathmandu']
   ],
   [
+    'NL',
     'Netherlands',
     '31',
     '🇳🇱',
     ['Amsterdam']
   ],
   [
+    'NC',
     'New Caledonia',
     '687',
     '🇳🇨',
     ['Noumea']
   ],
   [
+    'NZ',
     'New Zealand',
     '64',
     '🇳🇿',
     ['Auckland', 'Chatham']
   ],
   [
+    'NE',
     'Niger',
     '227',
     '🇳🇪',
     ['Niamey']
   ],
   [
+    'NG',
     'Nigeria',
     '234',
     '🇳🇬',
     ['Lagos']
   ],
   [
+    'NU',
     'Niue',
     '683',
     '🇳🇺',
     ['Niue']
   ],
   [
+    'NF',
     'Norfolk Island',
     '672',
     '🇳🇫',
     ['Norfolk']
   ],
   [
+    'MP',
     'Northern Mariana Islands',
     '1670',
     '🇲🇵',
     ['Saipan']
   ],
   [
+    'NO',
     'Norway',
     '47',
     '🇳🇴',
     ['Oslo']
   ],
   [
+    'OM',
     'Oman',
     '968',
     '🇴🇲',
     ['Muscat']
   ],
   [
+    'PK',
     'Pakistan',
     '92',
     '🇵🇰',
     ['Karachi']
   ],
   [
+    'PW',
     'Palau',
     '680',
     '🇵🇼',
     ['Palau']
   ],
   [
+    'PA',
     'Panama',
     '507',
     '🇵🇦',
     ['Panama']
   ],
   [
+    'PG',
     'Papua New Guinea',
     '675',
     '🇵🇬',
     ['Port_Moresby', 'Bougainville']
   ],
   [
+    'PY',
     'Paraguay',
     '595',
     '🇵🇾',
     ['Asuncion']
   ],
   [
+    'PE',
     'Peru',
     '51',
     '🇵🇪',
     ['Lima']
   ],
   [
+    'PH',
     'Philippines',
     '63',
     '🇵🇭',
     ['Manila']
   ],
   [
+    'PN',
     'Pitcairn',
     '872',
     '🇵🇳',
     ['Pitcairn']
   ],
   [
+    'PL',
     'Poland',
     '48',
     '🇵🇱',
     ['Warsaw']
   ],
   [
+    'PT',
     'Portugal',
     '351',
     '🇵🇹',
     ['Lisbon', 'Madeira', 'Azores']
   ],
   [
+    'PR',
     'Puerto Rico',
     '1939',
     '🇵🇷',
     ['Puerto_Rico']
   ],
   [
+    'QA',
     'Qatar',
     '974',
     '🇶🇦',
     ['Qatar']
   ],
   [
+    'RO',
     'Romania',
     '40',
     '🇷🇴',
     ['Bucharest']
   ],
   [
+    'RW',
     'Rwanda',
     '250',
     '🇷🇼',
     ['Kigali']
   ],
   [
+    'RE',
     'Reunion',
     '262',
     '🇷🇪',
     ['Reunion']
   ],
   [
+    'BL',
     'Saint Barthelemy',
     '590',
     '🇧🇱',
     ['St_Barthelemy']
   ],
   [
+    'SH',
     'Saint Helena, Ascension and Tristan Da Cunha',
     '290',
     '🇸🇭',
     ['St_Helena']
   ],
   [
+    'KN',
     'Saint Kitts and Nevis',
     '1869',
     '🇰🇳',
     ['St_Kitts']
   ],
   [
+    'LC',
     'Saint Lucia',
     '1758',
     '🇱🇨',
     ['St_Lucia']
   ],
   [
+    'MF',
     'Saint Martin',
     '590',
     '🇲🇫',
     ['Marigot']
   ],
   [
+    'PM',
     'Saint Pierre and Miquelon',
     '508',
     '🇵🇲',
     ['Miquelon']
   ],
   [
+    'VC',
     'Saint Vincent and the Grenadines',
     '1784',
     '🇻🇨',
     ['St_Vincent']
   ],
   [
+    'WS',
     'Samoa',
     '685',
     '🇼🇸',
     ['Apia']
   ],
   [
+    'SM',
     'San Marino',
     '378',
     '🇸🇲',
     ['San_Marino']
   ],
   [
+    'ST',
     'Sao Tome and Principe',
     '239',
     '🇸🇹',
     ['Sao_Tome']
   ],
   [
+    'SA',
     'Saudi Arabia',
     '966',
     '🇸🇦',
     ['Riyadh']
   ],
   [
+    'SN',
     'Senegal',
     '221',
     '🇸🇳',
     ['Dakar']
   ],
   [
+    'RS',
     'Serbia',
     '381',
     '🇷🇸',
     ['Belgrade']
   ],
   [
+    'SC',
     'Seychelles',
     '248',
     '🇸🇨',
     ['Mahe']
   ],
-
   [
+    'SL',
     'Sierra Leone',
     '232',
     '🇸🇱',
     ['Freetown']
   ],
   [
+    'SG',
     'Singapore',
     '65',
     '🇸🇬',
     ['Singapore']
   ],
   [
+    'SK',
     'Slovakia',
     '421',
     '🇸🇰',
     ['Bratislava']
   ],
   [
+    'SI',
     'Slovenia',
     '386',
     '🇸🇮',
     ['Ljubljana']
   ],
   [
+    'SB',
     'Solomon Islands',
     '677',
     '🇸🇧',
     ['Guadalcanal']
   ],
   [
+    'ZA',
     'South Africa',
     '27',
     '🇿🇦',
     ['Johannesburg']
   ],
   [
+    'ES',
     'Spain',
     '34',
     '🇪🇸',
     ['Madrid', 'Ceuta', 'Canary']
   ],
   [
+    'LK',
     'Sri Lanka',
     '94',
     '🇱🇰',
     ['Colombo']
   ],
   [
+    'SR',
     'Suriname',
     '597',
     '🇸🇷',
     ['Paramaribo']
   ],
   [
+    'SJ',
     'Svalbard and Jan Mayen',
     '47',
     '🇸🇯',
     ['Longyearbyen']
   ],
   [
+    'SZ',
     'Eswatini',
     '268',
     '🇸🇿',
     ['Mbabane']
   ],
   [
+    'SE',
     'Sweden',
     '46',
     '🇸🇪',
     ['Stockholm']
   ],
   [
+    'CH',
     'Switzerland',
     '41',
     '🇨🇭',
     ['Zurich']
   ],
   [
+    'TW',
     'Taiwan',
     '886',
     '🇹🇼',
     ['Taipei']
   ],
   [
+    'TJ',
     'Tajikistan',
     '992',
     '🇹🇯',
     ['Dushanbe']
   ],
   [
+    'TZ',
     'Tanzania, United Republic of',
     '255',
     '🇹🇿',
     ['Dar_es_Salaam']
   ],
   [
+    'TH',
     'Thailand',
     '66',
     '🇹🇭',
     ['Bangkok']
   ],
   [
+    'TL',
     'Timor-Leste',
     '670',
     '🇹🇱',
     ['Dili']
   ],
   [
+    'TG',
     'Togo',
     '228',
     '🇹🇬',
     ['Lome']
   ],
   [
+    'TK',
     'Tokelau',
     '690',
     '🇹🇰',
     ['Fakaofo']
   ],
   [
+    'TO',
     'Tonga',
     '676',
     '🇹🇴',
     ['Tongatapu']
   ],
   [
+    'TT',
     'Trinidad and Tobago',
     '1868',
     '🇹🇹',
     ['Port_of_Spain']
   ],
   [
+    'TN',
     'Tunisia',
     '216',
     '🇹🇳',
     ['Tunis']
   ],
   [
+    'TR',
     'Turkey',
     '90',
     '🇹🇷',
     ['Istanbul']
   ],
   [
+    'TM',
     'Turkmenistan',
     '993',
     '🇹🇲',
     ['Ashgabat']
   ],
   [
+    'TC',
     'Turks and Caicos Islands',
     '1649',
     '🇹🇨',
     ['Grand_Turk']
   ],
   [
+    'TV',
     'Tuvalu',
     '688',
     '🇹🇻',
     ['Funafuti']
   ],
   [
+    'UG',
     'Uganda',
     '256',
     '🇺🇬',
     ['Kampala']
   ],
   [
+    'UA',
     'Ukraine',
     '380',
     '🇺🇦',
@@ -1370,66 +1577,77 @@ export default [
     ]
   ],
   [
+    'AE',
     'United Arab Emirates',
     '971',
     '🇦🇪',
     ['Dubai']
   ],
   [
+    'GB',
     'United Kingdom',
     '44',
     '🇬🇧',
     ['London']
   ],
   [
+    'UY',
     'Uruguay',
     '598',
     '🇺🇾',
     ['Montevideo']
   ],
   [
+    'UZ',
     'Uzbekistan',
     '998',
     '🇺🇿',
     ['Samarkand', 'Tashkent']
   ],
   [
+    'VU',
     'Vanuatu',
     '678',
     '🇻🇺',
     ['Efate']
   ],
   [
+    'VN',
     'Vietnam',
     '84',
     '🇻🇳',
     ['Ho_Chi_Minh']
   ],
   [
+    'VG',
     'Virgin Islands, British',
     '1284',
     '🇻🇬',
     ['Tortola']
   ],
   [
+    'VI',
     'Virgin Islands, U.S.',
     '1340',
     '🇻🇮',
     ['St_Thomas']
   ],
   [
+    'WF',
     'Wallis and Futuna',
     '681',
     '🇼🇫',
     ['Wallis']
   ],
   [
+    'YE',
     'Yemen',
     '967',
     '🇾🇪',
     ['Aden']
   ],
   [
+    'ZM',
     'Zambia',
     '260',
     '🇿🇲',
diff --git a/app/javascript/submission_form/phone_step.vue b/app/javascript/submission_form/phone_step.vue
index 9c467894..844eca00 100644
--- a/app/javascript/submission_form/phone_step.vue
+++ b/app/javascript/submission_form/phone_step.vue
@@ -180,8 +180,8 @@ export default {
   },
   computed: {
     countries () {
-      return phoneData.map(([name, dial, flag, tz]) => {
-        return { name, dial, flag, tz }
+      return phoneData.map(([iso, name, dial, flag, tz]) => {
+        return { iso, name, dial, flag, tz }
       })
     },
     countriesDialIndex () {
diff --git a/app/javascript/submission_form/verification_step.vue b/app/javascript/submission_form/verification_step.vue
index d0b0a558..dff8ac47 100644
--- a/app/javascript/submission_form/verification_step.vue
+++ b/app/javascript/submission_form/verification_step.vue
@@ -95,7 +95,7 @@ export default {
     countryCode () {
       const browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
       const browserTz = browserTimeZone.split('/')[1]
-      const country = phoneData.find(([a, b, c, tz]) => tz.includes(browserTz))
+      const country = phoneData.find(([a, b, c, e, tz]) => tz.includes(browserTz))
 
       return country[0]
     },
@@ -107,7 +107,7 @@ export default {
         clientId: this.eidEasyData.client_id,
         docId: this.eidEasyData.doc_id,
         language: this.locale,
-        countryCode: this.browserCountry,
+        countryCode: this.countryCode,
         enabledMethods: {
           signature: this.eidEasyData.available_methods
         },
diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue
index 61439a78..db5d2783 100644
--- a/app/javascript/template_builder/area.vue
+++ b/app/javascript/template_builder/area.vue
@@ -237,7 +237,7 @@
     />
     <span
       v-if="field?.type && editable"
-      class="h-4 w-4 md:h-2.5 md:w-2.5 -right-1 rounded-full -bottom-1 border-gray-400 bg-white shadow-md border absolute cursor-nwse-resize"
+      class="h-4 w-4 lg:h-2.5 lg:w-2.5 -right-1 rounded-full -bottom-1 border-gray-400 bg-white shadow-md border absolute cursor-nwse-resize"
       @mousedown.stop="startResize"
       @touchstart="startTouchResize"
     />
@@ -257,7 +257,7 @@
       :to="modalContainerEl"
     >
       <ConditionsModal
-        :field="field"
+        :item="field"
         :build-default-name="buildDefaultName"
         @close="isShowConditionsModal = false"
       />
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index d8a9c3dc..f140d7b3 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -1,7 +1,8 @@
 <template>
   <div
     style="max-width: 1600px"
-    class="mx-auto pl-3 md:pl-4 h-full"
+    class="mx-auto pl-3 h-full"
+    :class="isMobile ? 'pl-4' : 'md:pl-4'"
   >
     <div
       v-if="pendingFieldAttachmentUuids.length && editable"
@@ -163,7 +164,7 @@
     <div
       id="main_container"
       class="flex"
-      :class="$slots.buttons || withTitle ? 'md:max-h-[calc(100%_-_60px)]' : 'md:max-h-[100%]'"
+      :class="$slots.buttons || withTitle ? (isMobile ? 'max-h-[calc(100%_-_60px)]' : 'md:max-h-[calc(100%_-_60px)]') : (isMobile ? 'max-h-[100%]' : 'md:max-h-[100%]')"
     >
       <div
         v-if="withDocumentsList"
@@ -219,7 +220,8 @@
       </div>
       <div
         id="pages_container"
-        class="w-full overflow-y-hidden md:overflow-y-auto overflow-x-hidden mt-0.5 pt-0.5"
+        class="w-full overflow-y-hidden overflow-x-hidden mt-0.5 pt-0.5"
+        :class="isMobile ? 'overflow-y-auto' : 'md:overflow-y-auto'"
       >
         <div
           ref="documents"
@@ -320,7 +322,7 @@
         </div>
       </div>
       <div
-        v-if="withFieldsList"
+        v-if="withFieldsList && !isMobile"
         id="fields_list_container"
         class="relative w-80 flex-none mt-1 pr-4 pl-0.5 hidden md:block"
         :class="drawField ? 'overflow-hidden' : 'overflow-y-auto overflow-x-hidden'"
@@ -362,6 +364,7 @@
             :default-submitters="defaultSubmitters"
             :draw-field-type="drawFieldType"
             :default-fields="[...defaultRequiredFields, ...defaultFields]"
+            :template="template"
             :default-required-fields="defaultRequiredFields"
             :field-types="fieldTypes"
             :with-sticky-submitters="withStickySubmitters"
@@ -378,14 +381,14 @@
         </div>
       </div>
     </div>
-    <div class="sticky bottom-0">
+    <div class="sticky bottom-0 z-10">
       <MobileDrawField
-        v-if="drawField && isBreakpointLg"
+        v-if="drawField && (isBreakpointLg || isMobile)"
         :draw-field="drawField"
         :fields="template.fields"
         :submitters="template.submitters"
         :selected-submitter="selectedSubmitter"
-        class="md:hidden"
+        :class="{ 'md:hidden': !isMobile }"
         :editable="editable"
         @cancel="[drawField = null, drawOption = null]"
         @change-submitter="[selectedSubmitter = $event, drawField.submitter_uuid = $event.uuid]"
@@ -396,6 +399,7 @@
         :default-fields="[...defaultRequiredFields, ...defaultFields]"
         :default-required-fields="defaultRequiredFields"
         :field-types="fieldTypes"
+        :class="{ 'md:hidden': !isMobile }"
         :selected-submitter="selectedSubmitter"
         @select="startFieldDraw($event)"
       />
@@ -695,6 +699,9 @@ export default {
     language () {
       return this.locale.split('-')[0].toLowerCase()
     },
+    isMobile () {
+      return /android|iphone|ipad/i.test(navigator.userAgent)
+    },
     defaultDateFormat () {
       const isUsBrowser = Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US')
       const isUsTimezone = new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/)
@@ -1023,6 +1030,22 @@ export default {
 
       if (!field.areas.length) {
         this.template.fields.splice(this.template.fields.indexOf(field), 1)
+
+        this.template.fields.forEach((f) => {
+          (f.conditions || []).forEach((c) => {
+            if (c.field_uuid === field.uuid) {
+              f.conditions.splice(f.conditions.indexOf(c), 1)
+            }
+          })
+        })
+
+        this.template.schema.forEach((item) => {
+          (item.conditions || []).forEach((c) => {
+            if (c.field_uuid === field.uuid) {
+              item.conditions.splice(item.conditions.indexOf(c), 1)
+            }
+          })
+        })
       }
 
       this.save()
diff --git a/app/javascript/template_builder/conditions_modal.vue b/app/javascript/template_builder/conditions_modal.vue
index 3fbe1313..5bcc0129 100644
--- a/app/javascript/template_builder/conditions_modal.vue
+++ b/app/javascript/template_builder/conditions_modal.vue
@@ -9,7 +9,7 @@
     <div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl">
       <div class="flex justify-between items-center border-b pb-2 mb-2 font-medium">
         <span>
-          {{ t('condition') }} - {{ field.name || buildDefaultName(field, template.fields) }}
+          {{ t('condition') }} - {{ item.name || buildDefaultName(item, template.fields) }}
         </span>
         <a
           href="#"
@@ -138,12 +138,12 @@
           </button>
         </form>
         <div
-          v-if="field.conditions?.[0]?.field_uuid"
+          v-if="item.conditions?.[0]?.field_uuid"
           class="text-center w-full mt-4"
         >
           <button
             class="link"
-            @click="[conditions = [], delete field.conditions, validateSaveAndClose()]"
+            @click="[conditions = [], delete item.conditions, validateSaveAndClose()]"
           >
             {{ t('remove_condition') }}
           </button>
@@ -158,7 +158,7 @@ export default {
   name: 'ConditionModal',
   inject: ['t', 'save', 'template', 'withConditions'],
   props: {
-    field: {
+    item: {
       type: Object,
       required: true
     },
@@ -170,22 +170,26 @@ export default {
   emits: ['close'],
   data () {
     return {
-      conditions: this.field.conditions?.[0] ? JSON.parse(JSON.stringify(this.field.conditions)) : [{}]
+      conditions: this.item.conditions?.[0] ? JSON.parse(JSON.stringify(this.item.conditions)) : [{}]
     }
   },
   computed: {
     fields () {
-      return this.template.fields.reduce((acc, f) => {
-        if (f !== this.field && f.submitter_uuid === this.field.submitter_uuid) {
-          acc.push(f)
-        }
+      if (this.item.submitter_uuid) {
+        return this.template.fields.reduce((acc, f) => {
+          if (f !== this.item && f.submitter_uuid === this.item.submitter_uuid) {
+            acc.push(f)
+          }
 
-        return acc
-      }, [])
+          return acc
+        }, [])
+      } else {
+        return this.template.fields
+      }
     }
   },
   created () {
-    this.field.conditions ||= []
+    this.item.conditions ||= []
   },
   methods: {
     conditionField (condition) {
@@ -219,9 +223,9 @@ export default {
       }
 
       if (this.conditions.find((f) => f.field_uuid)) {
-        this.field.conditions = this.conditions
+        this.item.conditions = this.conditions
       } else {
-        delete this.field.conditions
+        delete this.item.conditions
       }
 
       this.save()
diff --git a/app/javascript/template_builder/field.vue b/app/javascript/template_builder/field.vue
index 63aa2175..b5a38f62 100644
--- a/app/javascript/template_builder/field.vue
+++ b/app/javascript/template_builder/field.vue
@@ -236,7 +236,7 @@
       :to="modalContainerEl"
     >
       <ConditionsModal
-        :field="field"
+        :item="field"
         :build-default-name="buildDefaultName"
         @close="isShowConditionsModal = false"
       />
@@ -365,7 +365,7 @@ export default {
       } else {
         const typeIndex = fields.filter((f) => f.type === field.type).indexOf(field)
 
-        if (this.field.type === 'heading') {
+        if (field.type === 'heading') {
           return `${this.fieldNames[field.type]} ${typeIndex + 1}`
         } else {
           return `${this.fieldLabels[field.type]} ${typeIndex + 1}`
diff --git a/app/javascript/template_builder/fields.vue b/app/javascript/template_builder/fields.vue
index db8143dc..55932181 100644
--- a/app/javascript/template_builder/fields.vue
+++ b/app/javascript/template_builder/fields.vue
@@ -229,6 +229,10 @@ export default {
       type: Array,
       required: true
     },
+    template: {
+      type: Object,
+      required: true
+    },
     withHelp: {
       type: Boolean,
       required: false,
@@ -380,6 +384,14 @@ export default {
         })
       })
 
+      this.template.schema.forEach((item) => {
+        (item.conditions || []).forEach((c) => {
+          if (c.field_uuid === field.uuid) {
+            item.conditions.splice(item.conditions.indexOf(c), 1)
+          }
+        })
+      })
+
       this.save()
     }
   }
diff --git a/app/javascript/template_builder/mobile_draw_field.vue b/app/javascript/template_builder/mobile_draw_field.vue
index 556d2209..c8644766 100644
--- a/app/javascript/template_builder/mobile_draw_field.vue
+++ b/app/javascript/template_builder/mobile_draw_field.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="absolute text-center w-full bottom-0 pr-3 mb-4">
-    <span class="w-full bg-base-200 px-4 py-2 rounded-md inline-flex space-x-2 mx-auto items-center justify-between mb-2 z-20 md:hidden">
+    <span class="w-full bg-base-200 px-4 py-2 rounded-md inline-flex space-x-2 mx-auto items-center justify-between mb-2 z-20">
       <div class="flex items-center space-x-2">
         <component
           :is="fieldIcons[drawField.type]"
diff --git a/app/javascript/template_builder/mobile_fields.vue b/app/javascript/template_builder/mobile_fields.vue
index cde9f606..97def3cc 100644
--- a/app/javascript/template_builder/mobile_fields.vue
+++ b/app/javascript/template_builder/mobile_fields.vue
@@ -1,6 +1,6 @@
 <template>
   <span
-    class="dropdown dropdown-top dropdown-end absolute bottom-4 right-4 z-10 md:hidden"
+    class="dropdown dropdown-top dropdown-end absolute bottom-4 right-4 z-10"
   >
     <label
       class="btn btn-neutral text-white btn-circle btn-lg group"
@@ -12,9 +12,10 @@
         height="28"
       />
       <IconX
-        class="hidden group-focus:inline"
-        width="28"
-        height="28"
+        class="hidden group-focus:inline p-3"
+        width="64"
+        height="50"
+        @click="closeDropdown"
       />
     </label>
     <ul
diff --git a/app/javascript/template_builder/preview.vue b/app/javascript/template_builder/preview.vue
index 40639dcc..ae8c3fdb 100644
--- a/app/javascript/template_builder/preview.vue
+++ b/app/javascript/template_builder/preview.vue
@@ -9,14 +9,30 @@
         loading="lazy"
       >
       <div
-        class="group flex justify-end cursor-pointer top-0 bottom-0 left-0 right-0 absolute p-1"
+        class="group flex justify-end cursor-pointer top-0 bottom-0 left-0 right-0 absolute p-1 hover:bg-black/10 transition-colors"
         @click="$emit('scroll-to', item)"
       >
         <div
           v-if="editable"
           class="flex justify-between w-full"
         >
-          <div style="width: 26px" />
+          <div
+            style="width: 26px"
+            class="flex flex-col justify-between group-hover:opacity-100"
+            :class="{'opacity-0': !item.conditions?.length }"
+          >
+            <div>
+              <button
+                class="btn border-base-200 bg-white text-base-content btn-xs rounded hover:text-base-100 hover:bg-base-content hover:border-base-content w-full transition-colors p-0"
+                @click.stop="isShowConditionsModal = true"
+              >
+                <IconRouteAltLeft
+                  :width="14"
+                  :stroke-width="1.6"
+                />
+              </button>
+            </div>
+          </div>
           <div class="">
             <ReplaceButton
               v-if="withReplaceButton"
@@ -73,19 +89,36 @@
       />
     </div>
   </div>
+  <Teleport
+    v-if="isShowConditionsModal"
+    :to="modalContainerEl"
+  >
+    <ConditionsModal
+      :item="item"
+      :build-default-name="buildDefaultName"
+      @close="isShowConditionsModal = false"
+    />
+  </Teleport>
 </template>
 
 <script>
 import Contenteditable from './contenteditable'
 import Upload from './upload'
+import { IconRouteAltLeft } from '@tabler/icons-vue'
+import ConditionsModal from './conditions_modal'
 import ReplaceButton from './replace'
+import Field from './field'
+import FieldType from './field_type'
 
 export default {
   name: 'DocumentPreview',
   components: {
     Contenteditable,
+    IconRouteAltLeft,
+    ConditionsModal,
     ReplaceButton
   },
+  inject: ['t'],
   props: {
     item: {
       type: Object,
@@ -121,13 +154,24 @@ export default {
     }
   },
   emits: ['scroll-to', 'change', 'remove', 'up', 'down', 'replace'],
+  data () {
+    return {
+      isShowConditionsModal: false
+    }
+  },
   computed: {
+    fieldNames: FieldType.computed.fieldNames,
+    fieldLabels: FieldType.computed.fieldLabels,
     previewImage () {
       return [...this.document.preview_images].sort((a, b) => parseInt(a.filename) - parseInt(b.filename))[0]
+    },
+    modalContainerEl () {
+      return this.$el.getRootNode().querySelector('#docuseal_modal_container')
     }
   },
   methods: {
     upload: Upload.methods.upload,
+    buildDefaultName: Field.methods.buildDefaultName,
     onUpdateName (value) {
       this.item.name = value
 
diff --git a/app/jobs/process_submitter_completion_job.rb b/app/jobs/process_submitter_completion_job.rb
index c23c7f82..5f0d9758 100644
--- a/app/jobs/process_submitter_completion_job.rb
+++ b/app/jobs/process_submitter_completion_job.rb
@@ -10,10 +10,6 @@ class ProcessSubmitterCompletionJob
 
     is_all_completed = !submitter.submission.submitters.exists?(completed_at: nil)
 
-    if !is_all_completed && submitter.submission.submitters_order_preserved?
-      enqueue_next_submitter_request_notification(submitter)
-    end
-
     Submissions::EnsureResultGenerated.call(submitter)
 
     if is_all_completed && submitter.completed_at == submitter.submission.submitters.maximum(:completed_at)
@@ -28,6 +24,10 @@ class ProcessSubmitterCompletionJob
 
     create_completed_documents!(submitter)
 
+    if !is_all_completed && submitter.submission.submitters_order_preserved? && params['send_invitation_email'] != false
+      enqueue_next_submitter_request_notification(submitter)
+    end
+
     enqueue_completed_webhooks(submitter, is_all_completed:)
   end
 
diff --git a/app/models/submission.rb b/app/models/submission.rb
index e6aa35df..8567aaa1 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -57,6 +57,8 @@ class Submission < ApplicationRecord
 
   has_many_attached :preview_documents
 
+  has_many :template_accesses, primary_key: :template_id, foreign_key: :template_id, dependent: nil, inverse_of: false
+
   has_many :template_schema_documents,
            ->(e) { where(uuid: (e.template_schema.presence || e.template.schema).pluck('attachment_uuid')) },
            through: :template, source: :documents_attachments
diff --git a/app/models/submitter.rb b/app/models/submitter.rb
index c735a095..97a93773 100644
--- a/app/models/submitter.rb
+++ b/app/models/submitter.rb
@@ -54,6 +54,7 @@ class Submitter < ApplicationRecord
   has_many_attached :documents
   has_many_attached :attachments
   has_many_attached :preview_documents
+  has_many :template_accesses, through: :template
 
   has_many :document_generation_events, dependent: :destroy
   has_many :submission_events, dependent: :destroy
diff --git a/app/models/template.rb b/app/models/template.rb
index ec4ecec8..28441a9a 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -62,6 +62,7 @@ class Template < ApplicationRecord
 
   has_many :submissions, dependent: :destroy
   has_many :template_sharings, dependent: :destroy
+  has_many :template_accesses, dependent: :destroy
 
   scope :active, -> { where(archived_at: nil) }
   scope :archived, -> { where.not(archived_at: nil) }
diff --git a/app/models/template_access.rb b/app/models/template_access.rb
new file mode 100644
index 00000000..7e459513
--- /dev/null
+++ b/app/models/template_access.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: template_accesses
+#
+#  id          :bigint           not null, primary key
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  template_id :bigint           not null
+#  user_id     :bigint           not null
+#
+# Indexes
+#
+#  index_template_accesses_on_template_id_and_user_id  (template_id,user_id) UNIQUE
+#
+# Foreign Keys
+#
+#  fk_rails_...  (template_id => templates.id)
+#
+class TemplateAccess < ApplicationRecord
+  ADMIN_USER_ID = -1
+
+  belongs_to :template
+  belongs_to :user, optional: true
+end
diff --git a/app/views/layouts/_head_tags.html.erb b/app/views/layouts/_head_tags.html.erb
index 96a72e70..a6426f4f 100644
--- a/app/views/layouts/_head_tags.html.erb
+++ b/app/views/layouts/_head_tags.html.erb
@@ -1,4 +1,4 @@
 <title>
-  <%= content_for(:html_title) || 'DocuSeal | Open Source Document Signing' %>
+  <%= content_for(:html_title) || (signed_in? ? 'DocuSeal' : 'DocuSeal | Open Source Document Signing') %>
 </title>
 <%= render 'shared/meta' %>
diff --git a/app/views/shared/_meta.html.erb b/app/views/shared/_meta.html.erb
index 710bdf02..62bc3afa 100644
--- a/app/views/shared/_meta.html.erb
+++ b/app/views/shared/_meta.html.erb
@@ -1,7 +1,7 @@
 <% if Docuseal.demo? || (request.path != '/' && !devise_controller?) %>
   <meta name="robots" content="noindex">
 <% end %>
-<% title = content_for(:html_title) || 'DocuSeal | Open Source Document Filling and Signing' %>
+<% title = content_for(:html_title) || (signed_in? ? 'DocuSeal' : 'DocuSeal | Open Source Document Signing') %>
 <% description = content_for(:html_description) || 'Open source, self-hosted tool to streamline document filling and signing. Create custom PDF forms to complete and sign with an easy to use online tool.' %>
 <meta name="description" content="<%= description %>">
 <meta property="og:title" content="<%= title %>">
diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index 5723e891..e2f5f75e 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -65,7 +65,9 @@
   </div>
   <div class="flex md:max-h-[calc(100vh-60px)]">
     <div class="overflow-y-auto overflow-x-hidden hidden lg:block w-52 flex-none pr-3 mt-0.5 pt-0.5">
-      <% (@submission.template_schema || @submission.template.schema).each do |item| %>
+      <% values = @submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) } %>
+      <% schema = Submissions.filtered_conditions_schema(@submission, values:) %>
+      <% schema.each do |item| %>
         <% document = @submission.template_schema_documents.find { |a| item['attachment_uuid'] == a.uuid } %>
         <a href="#<%= "page-#{document.uuid}-0" %>" onclick="[event.preventDefault(), window[event.target.closest('a').href.split('#')[1]].scrollIntoView({ behavior: 'smooth', block: 'start' })]" class="block cursor-pointer">
           <img src="<%= Docuseal::URL_CACHE.fetch([document.id, document.uuid, 0].join(':'), expires_in: 10.minutes) { document.preview_images.first.url } %>" width="<%= document.preview_images.first.metadata['width'] %>" height="<%= document.preview_images.first.metadata['height'] %>" class="rounded border" loading="lazy">
@@ -79,10 +81,9 @@
       <div class="pr-3.5 pl-0.5">
         <% fields_index = Templates.build_field_areas_index(@submission.template_fields || @submission.template.fields) %>
         <% submitters_index = @submission.submitters.index_by(&:uuid) %>
-        <% values = @submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) } %>
         <% attachments_index = ActiveStorage::Attachment.where(record: @submission.submitters, name: :attachments).preload(:blob).index_by(&:uuid) %>
         <% page_blob_struct = Struct.new(:url, :metadata, keyword_init: true) %>
-        <% (@submission.template_schema || @submission.template.schema).each do |item| %>
+        <% schema.each do |item| %>
           <% document = @submission.template_schema_documents.find { |e| e.uuid == item['attachment_uuid'] } %>
           <% document_annots_index = document.metadata.dig('pdf', 'annotations')&.group_by { |e| e['page'] } || {} %>
           <% preview_images_index = document.preview_images.loaded? ? document.preview_images.index_by { |e| e.filename.base.to_i } : {} %>
@@ -121,7 +122,7 @@
                   <%= (@submission.template_submitters || @submission.template.submitters).find { |e| e['uuid'] == submitter&.uuid }&.dig('name') || "#{(index + 1).ordinalize} Submitter" %>
                 </span>
               </div>
-              <% if signed_in? && can?(:update, submitter) && !submitter.completed_at? && !submitter.declined_at? && !@submission.archived_at? && !@submission.expired? && !submitter.start_form_submission_events.any? %>
+              <% if signed_in? && can?(:update, @submission) && submitter && !submitter.completed_at? && !submitter.declined_at? && !@submission.archived_at? && !@submission.expired? && !submitter.start_form_submission_events.any? %>
                 <span class="tooltip tooltip-left" data-tip="<%= t('edit') %>">
                   <%= link_to edit_submitter_path(submitter), class: 'shrink-0 inline md:hidden md:group-hover:inline', data: { turbo_frame: 'modal' } do %>
                     <%= svg_icon('pencil', class: 'w-5 h-5') %>
@@ -173,15 +174,15 @@
                 </span>
               </div>
             <% end %>
-            <% if signed_in? && submitter && submitter.email && !submitter.completed_at && !@submission.archived_at? && can?(:update, submitter) && Accounts.can_send_emails?(current_account) && !@submission.expired? && !submitter.declined_at? %>
+            <% if signed_in? && submitter && submitter.email && !submitter.completed_at && !@submission.archived_at? && can?(:update, @submission) && Accounts.can_send_emails?(current_account) && !@submission.expired? && !submitter.declined_at? %>
               <div class="mt-2 mb-1">
                 <%= button_to button_title(title: submitter.sent_at? ? t('re_send_email') : t('send_email'), disabled_with: t('sending')), submitter_send_email_index_path(submitter_slug: submitter.slug), class: 'btn btn-sm btn-primary w-full' %>
               </div>
             <% end %>
-            <% if signed_in? && submitter && submitter.phone && !submitter.completed_at && !@submission.archived_at? && can?(:update, submitter) && !@submission.expired? && !submitter.declined_at? %>
+            <% if signed_in? && submitter && submitter.phone && !submitter.completed_at && !@submission.archived_at? && can?(:update, @submission) && !@submission.expired? && !submitter.declined_at? %>
               <%= render 'submissions/send_sms_button', submitter: %>
             <% end %>
-            <% if signed_in? && submitter && !submitter.completed_at? && !@submission.archived_at? && can?(:create, submitter) && !@submission.expired? && !submitter.declined_at? %>
+            <% if signed_in? && submitter && !submitter.completed_at? && !@submission.archived_at? && can?(:create, @submission) && !@submission.expired? && !submitter.declined_at? %>
               <div class="mt-2 mb-1">
                 <a class="btn btn-sm btn-primary w-full" target="_blank" href="<%= submit_form_path(slug: submitter.slug) %>">
                   <%= t('sign_in_person') %>
@@ -195,6 +196,7 @@
             <% submitter_field_counters[field['type']] += 1 %>
             <% value = values[field['uuid']] %>
             <% next if value.blank? %>
+            <% next if field['type'] == 'heading' %>
             <div class="pt-2.5 border-b border-base-300">
               <div class="text-xs font-medium uppercase mb-0.5" dir="auto">
                 <%= field['name'].presence || "#{t("#{field['type']}_field")} #{submitter_field_counters[field['type']]}" %>
diff --git a/app/views/submit_form/_submission_form.html.erb b/app/views/submit_form/_submission_form.html.erb
index 9336e948..37b8eacc 100644
--- a/app/views/submit_form/_submission_form.html.erb
+++ b/app/views/submit_form/_submission_form.html.erb
@@ -1,4 +1,4 @@
 <% data_attachments = attachments_index.values.select { |e| e.record_id == submitter.id }.to_json(only: %i[uuid created_at], methods: %i[url filename content_type]) %>
 <% data_fields = (submitter.submission.template_fields || submitter.submission.template.fields).select { |f| f['submitter_uuid'] == submitter.uuid }.to_json %>
 <% invite_submitters = (submitter.submission.template_submitters || submitter.submission.template.submitters).select { |s| s['invite_by_uuid'] == submitter.uuid && submitter.submission.submitters.none? { |e| e.uuid == s['uuid'] } }.to_json %>
-<submission-form data-is-demo="<%= Docuseal.demo? %>" data-reuse-signature="<%= configs[:reuse_signature] %>" data-require-signing-reason="<%= configs[:require_signing_reason] %>" data-with-signature-id="<%= configs[:with_signature_id] %>" data-with-confetti="<%= configs[:with_confetti] %>" data-completed-redirect-url="<%= submitter.preferences['completed_redirect_url'].presence || submitter.submission.template.preferences['completed_redirect_url'] %>" data-completed-message="<%= (configs[:completed_message]&.compact_blank.presence || submitter.submission.template.preferences['completed_message'] || {}).to_json %>" data-completed-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.preferences.key?('go_to_last') ? submitter.preferences['go_to_last'] : submitter.opened_at? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(submitter.submission.account) %>" data-invite-submitters="<%= invite_submitters %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>" data-previous-signature-value="<%= local_assigns[:signature_attachment]&.uuid %>" data-remember-signature="<%= configs[:prefill_signature] %>" data-dry-run="<%= local_assigns[:dry_run] %>" data-expand="<%= local_assigns[:expand] %>" data-scroll-padding="<%= local_assigns[:scroll_padding] %>" data-language="<%= I18n.locale.to_s.split('-').first %>"></submission-form>
+<submission-form data-is-demo="<%= Docuseal.demo? %>" data-schema="<%= schema.to_json %>" data-reuse-signature="<%= configs[:reuse_signature] %>" data-require-signing-reason="<%= configs[:require_signing_reason] %>" data-with-signature-id="<%= configs[:with_signature_id] %>" data-with-confetti="<%= configs[:with_confetti] %>" data-completed-redirect-url="<%= submitter.preferences['completed_redirect_url'].presence || submitter.submission.template.preferences['completed_redirect_url'] %>" data-completed-message="<%= (configs[:completed_message]&.compact_blank.presence || submitter.submission.template.preferences['completed_message'] || {}).to_json %>" data-completed-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.preferences.key?('go_to_last') ? submitter.preferences['go_to_last'] : submitter.opened_at? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(submitter.submission.account) %>" data-invite-submitters="<%= invite_submitters %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>" data-previous-signature-value="<%= local_assigns[:signature_attachment]&.uuid %>" data-remember-signature="<%= configs[:prefill_signature] %>" data-dry-run="<%= local_assigns[:dry_run] %>" data-expand="<%= local_assigns[:expand] %>" data-scroll-padding="<%= local_assigns[:scroll_padding] %>" data-language="<%= I18n.locale.to_s.split('-').first %>"></submission-form>
diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb
index 8385a30e..28f94fef 100644
--- a/app/views/submit_form/show.html.erb
+++ b/app/views/submit_form/show.html.erb
@@ -4,6 +4,7 @@
 <% values = @submitter.submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) } %>
 <% submitters_index = @submitter.submission.submitters.index_by(&:uuid) %>
 <% page_blob_struct = Struct.new(:url, :metadata, keyword_init: true) %>
+<% schema = Submissions.filtered_conditions_schema(@submitter.submission, values:, include_submitter_uuid: @submitter.uuid) %>
 <div style="max-height: -webkit-fill-available;">
   <div id="scrollbox">
     <div class="mx-auto block pb-72" style="max-width: 1000px">
@@ -35,32 +36,34 @@
           </div>
         </div>
       <% end %>
-      <% (@submitter.submission.template_schema || @submitter.submission.template.schema).each do |item| %>
+      <% schema.each do |item| %>
         <% document = @submitter.submission.template_schema_documents.find { |a| a.uuid == item['attachment_uuid'] } %>
-        <% document_annots_index = document.metadata.dig('pdf', 'annotations')&.group_by { |e| e['page'] } || {} %>
-        <% preview_images_index = document.preview_images.loaded? ? document.preview_images.index_by { |e| e.filename.base.to_i } : {} %>
-        <% lazyload_metadata = document.preview_images.last.metadata %>
-        <% (document.metadata.dig('pdf', 'number_of_pages') || (document.preview_images.loaded? ? preview_images_index.size : document.preview_images.size)).times do |index| %>
-          <% page = preview_images_index[index] || page_blob_struct.new(metadata: lazyload_metadata, url: preview_document_page_path(document.signed_uuid, "#{index}.jpg")) %>
-          <div class="relative my-4 shadow-md">
-            <img loading="lazy" src="<%= page.url %>" width="<%= page.metadata['width'] %>" height="<%= page.metadata['height'] %>">
-            <div id="page-<%= [document.uuid, index].join('-') %>" class="top-0 bottom-0 left-0 right-0 absolute">
-              <% document_annots_index[index]&.each do |annot| %>
-                <%= render 'submissions/annotation', annot: %>
-              <% end %>
-              <% fields_index.dig(document.uuid, index)&.each do |(area, field)| %>
-                <% value = values[field['uuid']].presence || (field['default_value'].present? ? Submitters::SubmitValues.template_default_value_for_submitter(field['default_value'], @submitter.submission.submitters.find { |e| e.uuid == field['submitter_uuid'] }, with_time: false) : nil) %>
-                <% next if value.blank? %>
-                <% next if !field['readonly'] && field['submitter_uuid'] == @submitter.uuid %>
-                <% next if value == '{{date}}' && field['submitter_uuid'] != @submitter.uuid %>
-                <% next if field['conditions'].present? && values[field['uuid']].blank? && field['submitter_uuid'] != @submitter.uuid %>
-                <% next if field['conditions'].present? && field['submitter_uuid'] == @submitter.uuid %>
-                <% next if field.dig('preferences', 'formula').present? && field['submitter_uuid'] == @submitter.uuid %>
-                <%= render 'submissions/value', area:, field:, attachments_index: @attachments_index, value:, locale: @submitter.account.locale, timezone: @submitter.account.timezone, submitter: submitters_index[field['submitter_uuid']], with_signature_id: @form_configs[:with_signature_id] %>
-              <% end %>
+        <div id="document-<%= document.uuid %>">
+          <% document_annots_index = document.metadata.dig('pdf', 'annotations')&.group_by { |e| e['page'] } || {} %>
+          <% preview_images_index = document.preview_images.loaded? ? document.preview_images.index_by { |e| e.filename.base.to_i } : {} %>
+          <% lazyload_metadata = document.preview_images.last.metadata %>
+          <% (document.metadata.dig('pdf', 'number_of_pages') || (document.preview_images.loaded? ? preview_images_index.size : document.preview_images.size)).times do |index| %>
+            <% page = preview_images_index[index] || page_blob_struct.new(metadata: lazyload_metadata, url: preview_document_page_path(document.signed_uuid, "#{index}.jpg")) %>
+            <div class="relative my-4 shadow-md">
+              <img loading="lazy" src="<%= page.url %>" width="<%= page.metadata['width'] %>" height="<%= page.metadata['height'] %>">
+              <div id="page-<%= [document.uuid, index].join('-') %>" class="top-0 bottom-0 left-0 right-0 absolute">
+                <% document_annots_index[index]&.each do |annot| %>
+                  <%= render 'submissions/annotation', annot: %>
+                <% end %>
+                <% fields_index.dig(document.uuid, index)&.each do |(area, field)| %>
+                  <% value = values[field['uuid']].presence || (field['default_value'].present? ? Submitters::SubmitValues.template_default_value_for_submitter(field['default_value'], @submitter.submission.submitters.find { |e| e.uuid == field['submitter_uuid'] }, with_time: false) : nil) %>
+                  <% next if value.blank? %>
+                  <% next if !field['readonly'] && field['submitter_uuid'] == @submitter.uuid %>
+                  <% next if value == '{{date}}' && field['submitter_uuid'] != @submitter.uuid %>
+                  <% next if field['conditions'].present? && values[field['uuid']].blank? && field['submitter_uuid'] != @submitter.uuid %>
+                  <% next if field['conditions'].present? && field['submitter_uuid'] == @submitter.uuid %>
+                  <% next if field.dig('preferences', 'formula').present? && field['submitter_uuid'] == @submitter.uuid %>
+                  <%= render 'submissions/value', area:, field:, attachments_index: @attachments_index, value:, locale: @submitter.account.locale, timezone: @submitter.account.timezone, submitter: submitters_index[field['submitter_uuid']], with_signature_id: @form_configs[:with_signature_id] %>
+                <% end %>
+              </div>
             </div>
-          </div>
-        <% end %>
+          <% end %>
+        </div>
       <% end %>
       <%= render 'shared/attribution', link_path: '/start', account: @submitter.account, with_style: false %>
       <% if @form_configs[:policy_links].present? %>
@@ -76,7 +79,7 @@
 <div class="fixed bottom-0 w-full h-0 z-20">
   <div class="mx-auto" style="max-width: 1000px">
     <div class="relative md:mx-32">
-      <%= render 'submit_form/submission_form', attachments_index: @attachments_index, submitter: @submitter, signature_attachment: @signature_attachment, configs: @form_configs, dry_run: local_assigns[:dry_run], expand: local_assigns[:expand], scroll_padding: local_assigns.fetch(:scroll_padding, '-110px') %>
+      <%= render 'submit_form/submission_form', attachments_index: @attachments_index, submitter: @submitter, signature_attachment: @signature_attachment, configs: @form_configs, dry_run: local_assigns[:dry_run], expand: local_assigns[:expand], scroll_padding: local_assigns.fetch(:scroll_padding, '-110px'), schema: %>
     </div>
   </div>
 </div>
diff --git a/app/views/submitter_mailer/completed_email.html.erb b/app/views/submitter_mailer/completed_email.html.erb
index 70792c86..7269fb39 100644
--- a/app/views/submitter_mailer/completed_email.html.erb
+++ b/app/views/submitter_mailer/completed_email.html.erb
@@ -2,6 +2,6 @@
   <%= render 'custom_content', content: @body, submitter: @submitter %>
 <% else %>
   <p><%= t('hi_there') %>,</p>
-  <p><%= I18n.t(:name_has_been_completed_by_submitters, name: @submitter.submission.template.name, submitters: @submitter.submission.submitters.order(:completed_at).map { |e| e.name || e.email || e.phone }.join(', ')) %></p>
+  <p><%= I18n.t(:name_has_been_completed_by_submitters, name: @submitter.submission.template.name, submitters: @submitter.submission.submitters.order(:completed_at).map { |e| e.name || e.email || e.phone }.uniq.join(', ')) %></p>
   <p><%= link_to submission_url(@submitter.submission), submission_url(@submitter.submission) %></p>
 <% end %>
diff --git a/app/views/templates/_access_icon.html.erb b/app/views/templates/_access_icon.html.erb
new file mode 100644
index 00000000..e69de29b
diff --git a/app/views/templates/_submission.html.erb b/app/views/templates/_submission.html.erb
index ad0d490b..7b3488b7 100644
--- a/app/views/templates/_submission.html.erb
+++ b/app/views/templates/_submission.html.erb
@@ -51,7 +51,7 @@
               <a href="<%= submission_path(submission) %>" class="text-lg break-all peer">
                 <%= submitter.name || submitter.email || submitter.phone %>
               </a>
-              <% if can?(:update, submitter) && !submitter.start_form_submission_events.any? && !submission.archived_at? && !submission.expired? && !submitter.declined_at? %>
+              <% if can?(:update, submission) && !submitter.start_form_submission_events.any? && !submission.archived_at? && !submission.expired? && !submitter.declined_at? %>
                 <span class="pl-0.5 tooltip tooltip-top md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
                   <%= link_to edit_submitter_path(submitter), class: 'shrink-0', data: { turbo_frame: 'modal' } do %>
                     <%= svg_icon('pencil', class: 'w-5 h-5') %>
@@ -144,7 +144,7 @@
                     <a href="<%= submission_path(submission) %>" class="text-lg break-all peer">
                       <%= submitter.name || submitter.email || submitter.phone %>
                     </a>
-                    <% if can?(:update, submitter) && !submitter.start_form_submission_events.any? && !submission.archived_at? && !submission.expired? && !submitter.declined_at? %>
+                    <% if can?(:update, submission) && !submitter.start_form_submission_events.any? && !submission.archived_at? && !submission.expired? && !submitter.declined_at? %>
                       <span class="pl-0.5 tooltip tooltip-top md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
                         <%= link_to edit_submitter_path(submitter), class: 'shrink-0', data: { turbo_frame: 'modal' } do %>
                           <%= svg_icon('pencil', class: 'w-5 h-5') %>
diff --git a/app/views/templates/_template.html.erb b/app/views/templates/_template.html.erb
index e0dbb6a1..4f954b31 100644
--- a/app/views/templates/_template.html.erb
+++ b/app/views/templates/_template.html.erb
@@ -1,6 +1,9 @@
 <div class="h-36 relative group">
   <a href="<%= template_path(template) %>" class="flex h-full flex-col justify-between rounded-2xl pt-6 px-7 w-full bg-base-200 peer">
     <div class="pb-4 text-xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+      <% if template.template_accesses.present? %>
+        <%= svg_icon('lock', class: 'w-6 h-6 inline -translate-y-[4px]') %>
+      <% end %>
       <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
     </div>
     <div class="pb-6 pt-1 space-y-1">
diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb
index 83726b21..8a0628cb 100644
--- a/app/views/templates/_title.html.erb
+++ b/app/views/templates/_title.html.erb
@@ -1,12 +1,15 @@
 <div class="flex flex-col items-start md:flex-row space-y-2 md:space-y-0 md:space-x-2 md:justify-between md:items-start mb-6 md:mb-3">
   <div class="relative flex items-start justify-between w-full space-x-0">
     <div>
-      <h1 class="text-3xl md:text-[2em] font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
-        <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
-        <% if template.archived_at? %>
-          <span class="ml-1 badge badge-outline badge-lg align-middle"><%= t('archived') %></span>
-        <% end %>
-      </h1>
+      <div id="template_title" class="flex">
+        <h1 class="text-3xl md:text-[2em] font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+          <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
+          <% if template.archived_at? %>
+            <span class="ml-1 badge badge-outline badge-lg align-middle"><%= t('archived') %></span>
+          <% end %>
+        </h1>
+        <%= render 'templates/access_icon', template: @template %>
+      </div>
       <% if @template.account_id == current_account.id %>
         <div class="flex items-center justify-between">
           <div class="flex items-center">
diff --git a/app/views/templates_preferences/_access.html.erb b/app/views/templates_preferences/_access.html.erb
new file mode 100644
index 00000000..e69de29b
diff --git a/app/views/templates_preferences/show.html.erb b/app/views/templates_preferences/show.html.erb
index 72437309..1059bcca 100644
--- a/app/views/templates_preferences/show.html.erb
+++ b/app/views/templates_preferences/show.html.erb
@@ -19,6 +19,7 @@
     </toggle-visible>
   <% end %>
   <div id="general" class="px-5 mb-4">
+    <%= render 'access' %>
     <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-2' }, data: { close_on_submit: false } do |f| %>
       <toggle-on-submit data-element-id="bcc_saved_alert"></toggle-on-submit>
       <%= f.fields_for :preferences, Struct.new(:bcc_completed).new(@template.preferences['bcc_completed']) do |ff| %>
diff --git a/config/database.yml b/config/database.yml
index f26c54ef..20921d2d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -19,6 +19,9 @@ production:
   username: <%= ENV['DATABASE_USER'] %>
   password: <%= ENV['DATABASE_PASSWORD'] %>
   database: <%= ENV['DATABASE_NAME'] %>
+  <% if !ENV['DATABASE_SEARCH_PATH'].to_s.empty? %>
+  search_path: <%= ENV['DATABASE_SEARCH_PATH'] %>
+  <% end %>
 <% elsif ENV['DATABASE_URL'].to_s.empty? %>
   adapter: sqlite3
   database: <%= ENV['WORKDIR'] || '.' %>/db.sqlite3
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 05e22545..87c69fcd 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -23,6 +23,15 @@ en: &en
   unarchive: Unarchive
   first_party: 'First Party'
   remove_filter: Remove filter
+  add: Add
+  adding: Adding
+  owner: Owner
+  select_user: Select user
+  team_member_permissions: Team member permissions
+  entire_team: Entire team
+  admin_only: Admin only
+  accessiable_by: Accessiable by
+  team_access: Team access
   document_download_filename_format: Document download filename format
   document_name: Document Name
   docuseal_trusted_signature: DocuSeal Trusted Signature
@@ -689,6 +698,15 @@ en: &en
       read: Read your data
 
 es: &es
+  add: Agregar
+  adding: Agregando
+  owner: Propietario
+  select_user: Seleccionar usuario
+  team_member_permissions: Permisos de miembros del equipo
+  entire_team: Todo el equipo
+  admin_only: Solo administrador
+  accessiable_by: Accesible por
+  team_access: Acceso del equipo
   remove_filter: Eliminar filtro
   document_download_filename_format: Formato del nombre del archivo de descarga del documento
   document_name: Nombre del documento
@@ -1360,6 +1378,15 @@ es: &es
       read: Leer tus datos
 
 it: &it
+  add: Aggiungi
+  adding: Aggiungendo
+  owner: Proprietario
+  select_user: Seleziona utente
+  team_member_permissions: Permessi membri del team
+  entire_team: Intero team
+  admin_only: Solo amministratore
+  accessiable_by: Accessibile da
+  team_access: Accesso al team
   remove_filter: Rimuovi filtro
   document_download_filename_format: Formato del nome file scaricato
   document_name: Nome del Documento
@@ -2031,6 +2058,15 @@ it: &it
       read: Leggi i tuoi dati
 
 fr: &fr
+  add: Ajouter
+  adding: Ajout
+  owner: Propriétaire
+  select_user: Sélectionner un utilisateur
+  team_member_permissions: Permissions des membres de l'équipe
+  entire_team: Équipe entière
+  admin_only: Administrateur uniquement
+  accessiable_by: Accessible par
+  team_access: Accès à l'équipe
   remove_filter: Supprimer le filtre
   document_download_filename_format: Format du nom de fichier du téléchargement de document
   document_name: Nom du document
@@ -2703,6 +2739,15 @@ fr: &fr
       read: Lire vos données
 
 pt: &pt
+  add: Adicionar
+  adding: Adicionando
+  owner: Proprietário
+  select_user: Selecionar usuário
+  team_member_permissions: Permissões de membro da equipe
+  entire_team: Toda a equipe
+  admin_only: Somente administrador
+  accessiable_by: Acessível por
+  team_access: Acesso à equipe
   remove_filter: Remover filtro
   document_download_filename_format: Formato do nome do arquivo de download do documento
   document_name: Nome do documento
@@ -3374,6 +3419,15 @@ pt: &pt
       read: Ler seus dados
 
 de: &de
+  add: Hinzufügen
+  adding: Hinzufügen
+  owner: Eigentümer
+  select_user: Benutzer auswählen
+  team_member_permissions: Berechtigungen für Teammitglieder
+  entire_team: Gesamtes Team
+  admin_only: Nur Administratoren
+  accessiable_by: Zugänglich für
+  team_access: Teamzugang
   remove_filter: Filter entfernen
   document_download_filename_format: Format des Dateinamens beim Herunterladen von Dokumenten
   document_name: Dokumentname
diff --git a/db/migrate/20241207172237_create_template_accesses.rb b/db/migrate/20241207172237_create_template_accesses.rb
new file mode 100644
index 00000000..bdf2d2ce
--- /dev/null
+++ b/db/migrate/20241207172237_create_template_accesses.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateTemplateAccesses < ActiveRecord::Migration[7.2]
+  def change
+    create_table :template_accesses do |t|
+      t.references :template, null: false, foreign_key: true, index: false
+      t.references :user, null: false, foreign_key: false, index: false
+
+      t.index %i[template_id user_id], unique: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 92e6a982..89cf0fae 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2024_10_29_192232) do
+ActiveRecord::Schema[7.2].define(version: 2024_12_07_172237) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -275,6 +275,14 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_29_192232) do
     t.index ["submission_id"], name: "index_submitters_on_submission_id"
   end
 
+  create_table "template_accesses", force: :cascade do |t|
+    t.bigint "template_id", null: false
+    t.bigint "user_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["template_id", "user_id"], name: "index_template_accesses_on_template_id_and_user_id", unique: true
+  end
+
   create_table "template_folders", force: :cascade do |t|
     t.string "name", null: false
     t.bigint "author_id", null: false
@@ -393,6 +401,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_29_192232) do
   add_foreign_key "submissions", "templates"
   add_foreign_key "submissions", "users", column: "created_by_user_id"
   add_foreign_key "submitters", "submissions"
+  add_foreign_key "template_accesses", "templates"
   add_foreign_key "template_folders", "accounts"
   add_foreign_key "template_folders", "users", column: "author_id"
   add_foreign_key "template_sharings", "templates"
diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb
index 572fd0a4..430b5757 100644
--- a/lib/replace_email_variables.rb
+++ b/lib/replace_email_variables.rb
@@ -92,6 +92,6 @@ module ReplaceEmailVariables
   end
 
   def build_submission_submitters(submission)
-    submission.submitters.order(:completed_at).map { |e| e.name || e.email || e.phone }.join(', ')
+    submission.submitters.order(:completed_at).map { |e| e.name || e.email || e.phone }.uniq.join(', ')
   end
 end
diff --git a/lib/submissions.rb b/lib/submissions.rb
index ab9d9887..86988d09 100644
--- a/lib/submissions.rb
+++ b/lib/submissions.rb
@@ -124,4 +124,42 @@ module Submissions
 
     fixed_email
   end
+
+  def filtered_conditions_schema(submission, values: nil, include_submitter_uuid: nil)
+    fields_uuid_index = nil
+
+    (submission.template_schema || submission.template.schema).filter_map do |item|
+      if item['conditions'].present?
+        fields_uuid_index ||=
+          (submission.template_fields || submission.template.fields).index_by { |f| f['uuid'] }
+
+        values ||= submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) }
+
+        next unless check_document_conditions(item, values, fields_uuid_index, include_submitter_uuid:)
+      end
+
+      item
+    end
+  end
+
+  def check_document_conditions(item, values, fields_index, include_submitter_uuid: nil)
+    return true if item['conditions'].blank?
+
+    item['conditions'].all? do |condition|
+      result =
+        if fields_index[condition['field_uuid']]['submitter_uuid'] == include_submitter_uuid
+          true
+        else
+          Submitters::SubmitValues.check_field_condition(condition, values, fields_index)
+        end
+
+      item['conditions'].each_with_object([]) do |c, acc|
+        if c['operation'] == 'or'
+          acc.push(acc.pop || result)
+        else
+          acc.push(result)
+        end
+      end.exclude?(false)
+    end
+  end
 end
diff --git a/lib/submissions/generate_combined_attachment.rb b/lib/submissions/generate_combined_attachment.rb
index 1c7bc1f3..75b3fcfc 100644
--- a/lib/submissions/generate_combined_attachment.rb
+++ b/lib/submissions/generate_combined_attachment.rb
@@ -49,6 +49,8 @@ module Submissions
       submitter.submission.template_schema.each do |item|
         pdf = pdfs_index[item['attachment_uuid']]
 
+        next unless pdf
+
         pdf.dispatch_message(:complete_objects)
 
         pdf.pages.each { |page| result.pages << result.import(page) }
diff --git a/lib/submissions/generate_preview_attachments.rb b/lib/submissions/generate_preview_attachments.rb
index 423ded4a..f03f689f 100644
--- a/lib/submissions/generate_preview_attachments.rb
+++ b/lib/submissions/generate_preview_attachments.rb
@@ -37,9 +37,11 @@ module Submissions
       original_documents = template.documents.preload(:blob)
 
       result_attachments =
-        (submission.template_schema || template.schema).map do |item|
+        (submission.template_schema || template.schema).filter_map do |item|
           pdf = pdfs_index[item['attachment_uuid']]
 
+          next if pdf.nil?
+
           if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
             pdf = GenerateResultAttachments.normalize_image_pdf(pdf)
 
diff --git a/lib/submissions/generate_result_attachments.rb b/lib/submissions/generate_result_attachments.rb
index 7c66bff9..317fdc37 100644
--- a/lib/submissions/generate_result_attachments.rb
+++ b/lib/submissions/generate_result_attachments.rb
@@ -56,9 +56,11 @@ module Submissions
       original_documents = template.documents.preload(:blob)
 
       result_attachments =
-        submitter.submission.template_schema.map do |item|
+        submitter.submission.template_schema.filter_map do |item|
           pdf = pdfs_index[item['attachment_uuid']]
 
+          next if pdf.nil?
+
           if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
             pdf = normalize_image_pdf(pdf)
 
@@ -545,7 +547,15 @@ module Submissions
       documents   = latest_submitter&.documents&.preload(:blob).to_a.presence
       documents ||= submission.template_schema_documents.preload(:blob)
 
-      documents.to_h do |attachment|
+      attachment_uuids = Submissions.filtered_conditions_schema(submission).pluck('attachment_uuid')
+      attachments_index = documents.index_by { |a| a.metadata['original_uuid'] || a.uuid }
+
+      attachment_uuids.each_with_object({}) do |uuid, acc|
+        attachment = attachments_index[uuid]
+        attachment ||= submission.template_schema_documents.preload(:blob).find { |a| a.uuid == uuid }
+
+        next unless attachment
+
         pdf =
           if attachment.image?
             build_pdf_from_image(attachment)
@@ -555,23 +565,23 @@ module Submissions
 
         pdf = maybe_rotate_pdf(pdf)
 
-        if flatten
-          begin
-            pdf.acro_form.create_appearances(force: true) if pdf.acro_form && pdf.acro_form[:NeedAppearances]
-            pdf.acro_form&.flatten
-          rescue HexaPDF::MissingGlyphError
-            nil
-          rescue StandardError => e
-            Rollbar.error(e) if defined?(Rollbar)
-          end
-        end
+        maybe_flatten_pdf(pdf) if flatten
 
         pdf.config['font.on_missing_glyph'] = method(:on_missing_glyph).to_proc
 
-        [attachment.metadata['original_uuid'] || attachment.uuid, pdf]
+        acc[uuid] = pdf
       end
     end
 
+    def maybe_flatten_pdf(pdf)
+      pdf.acro_form.create_appearances(force: true) if pdf.acro_form && pdf.acro_form[:NeedAppearances]
+      pdf.acro_form&.flatten
+    rescue HexaPDF::MissingGlyphError
+      nil
+    rescue StandardError => e
+      Rollbar.error(e) if defined?(Rollbar)
+    end
+
     def maybe_rotate_pdf(pdf)
       return pdf if pdf.pages.size > MAX_PAGE_ROTATE
 
diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb
index 532fb593..ff710d59 100644
--- a/lib/submitters/submit_values.rb
+++ b/lib/submitters/submit_values.rb
@@ -183,10 +183,17 @@ module Submitters
     def maybe_remove_condition_values(submitter)
       fields_uuid_index = submitter.submission.template_fields.index_by { |e| e['uuid'] }
 
+      attachments_index =
+        Submissions.filtered_conditions_schema(submitter.submission).index_by { |i| i['attachment_uuid'] }
+
       submitter.submission.template_fields.each do |field|
         next if field['submitter_uuid'] != submitter.uuid
 
         submitter.values.delete(field['uuid']) unless check_field_conditions(submitter, field, fields_uuid_index)
+
+        if field['areas'].present? && field['areas'].none? { |area| attachments_index[area['attachment_uuid']] }
+          submitter.values.delete(field['uuid'])
+        end
       end
 
       submitter.values