diff --git a/admin/form-builder/assets/js/components/form-fields-v4-1/template.php b/admin/form-builder/assets/js/components/form-fields-v4-1/template.php
index a1f9bd188..17fd2696d 100644
--- a/admin/form-builder/assets/js/components/form-fields-v4-1/template.php
+++ b/admin/form-builder/assets/js/components/form-fields-v4-1/template.php
@@ -58,7 +58,7 @@ class="panel-form-field-buttons wpuf-grid wpuf-grid-cols-1 wpuf-gap-3 sm:wpuf-gr
                             data-source="panel"
                             @click="alert_pro_feature(field)"
                             class="wpuf-relative wpuf-group/pro-field">
-                                <div class="wpuf-opacity-50 wpuf-field-button wpuf-flex wpuf-items-center wpuf-rounded-lg wpuf-border wpuf-border-gray-200 wpuf-bg-white wpuf-shadow-sm wpuf-px-4 wpuf-py-3 hover:wpuf-border-gray-300 hover:wpuf-cursor-pointer">
+                                <div class="wpuf-opacity-50 wpuf-field-button wpuf-flex wpuf-items-center wpuf-rounded-lg wpuf-border wpuf-border-gray-200 wpuf-bg-white wpuf-shadow-sm wpuf-p-4 hover:wpuf-border-gray-300 hover:wpuf-cursor-pointer">
                                     <div
                                         v-if="field_settings[field].icon"
                                         class="wpuf-shrink-0 wpuf-mr-2 wpuf-text-gray-400">
diff --git a/assets/js-templates/form-components.php b/assets/js-templates/form-components.php
index 0130dc122..6a94a185c 100644
--- a/assets/js-templates/form-components.php
+++ b/assets/js-templates/form-components.php
@@ -1146,7 +1146,7 @@ class="panel-form-field-buttons wpuf-grid wpuf-grid-cols-1 wpuf-gap-3 sm:wpuf-gr
                             data-source="panel"
                             @click="alert_pro_feature(field)"
                             class="wpuf-relative wpuf-group/pro-field">
-                                <div class="wpuf-opacity-50 wpuf-field-button wpuf-flex wpuf-items-center wpuf-rounded-lg wpuf-border wpuf-border-gray-200 wpuf-bg-white wpuf-shadow-sm wpuf-px-4 wpuf-py-3 hover:wpuf-border-gray-300 hover:wpuf-cursor-pointer">
+                                <div class="wpuf-opacity-50 wpuf-field-button wpuf-flex wpuf-items-center wpuf-rounded-lg wpuf-border wpuf-border-gray-200 wpuf-bg-white wpuf-shadow-sm wpuf-p-4 hover:wpuf-border-gray-300 hover:wpuf-cursor-pointer">
                                     <div
                                         v-if="field_settings[field].icon"
                                         class="wpuf-shrink-0 wpuf-mr-2 wpuf-text-gray-400">
diff --git a/includes/Ajax/Admin_Form_Builder_Ajax.php b/includes/Ajax/Admin_Form_Builder_Ajax.php
index c9762113e..014dac5e6 100644
--- a/includes/Ajax/Admin_Form_Builder_Ajax.php
+++ b/includes/Ajax/Admin_Form_Builder_Ajax.php
@@ -95,10 +95,6 @@ public function wpuf_get_post_taxonomies_old() {
             wp_send_json_error( __( 'Unauthorized operation', 'wp-user-frontend' ) );
         }
 
-        if ( ! current_user_can( wpuf_admin_role() ) ) {
-            wp_send_json_error( __( 'Unauthorized operation', 'wp-user-frontend' ) );
-        }
-
         if ( isset( $post_type ) && empty( $post_data['post_type'] ) ) {
             wp_send_json_error( __( 'Invalid post type', 'wp-user-frontend' ) );
         }
@@ -146,10 +142,6 @@ public function get_post_taxonomies() {
             wp_send_json_error( __( 'Unauthorized operation', 'wp-user-frontend' ) );
         }
 
-        if ( ! current_user_can( wpuf_admin_role() ) ) {
-            wp_send_json_error( __( 'Unauthorized operation', 'wp-user-frontend' ) );
-        }
-
         if ( isset( $post_type ) && empty( $post_data['post_type'] ) ) {
             wp_send_json_error( __( 'Invalid post type', 'wp-user-frontend' ) );
         }
@@ -186,7 +178,7 @@ public function get_post_taxonomies() {
                 $cat .= '<div class="wpuf-mt-6 wpuf-input-container taxonomy-container" data-taxonomy="' . esc_attr( $tax->name ) . '">';
                 $cat .= '<div class="wpuf-flex wpuf-items-center">';
                 $cat .= '<label for="' . esc_attr( $select_id ) . '" class="wpuf-text-sm wpuf-text-gray-700 wpuf-my-2">';
-                $cat .= sprintf( __( 'Default %s %s', 'wp-user-frontend' ), $post_type, $tax->label );
+                $cat .= sprintf( __( 'Default %s', 'wp-user-frontend' ), $tax->label );
                 $cat .= '</label></div>';
 
                 $cat .= '<select
diff --git a/includes/Traits/FieldableTrait.php b/includes/Traits/FieldableTrait.php
index 327991952..c158ce924 100644
--- a/includes/Traits/FieldableTrait.php
+++ b/includes/Traits/FieldableTrait.php
@@ -75,6 +75,16 @@ public function set_wp_post_types() {
             $wpuf_post_types[] = 'tribe_events';
         }
         
+        // Add product if WooCommerce post type is registered
+        if ( post_type_exists( 'product' ) && ! in_array( 'product', $wpuf_post_types, true ) ) {
+            $wpuf_post_types[] = 'product';
+        }
+        
+        // Add download if Easy Digital Downloads post type is registered
+        if ( post_type_exists( 'download' ) && ! in_array( 'download', $wpuf_post_types, true ) ) {
+            $wpuf_post_types[] = 'download';
+        }
+        
         $ignore_taxonomies = apply_filters( 'wpuf-ignore-taxonomies', [
             'post_format',
         ] );
@@ -103,6 +113,26 @@ public function set_wp_post_types() {
                     'terms'        => [],
                 ];
             }
+            
+            // Special handling for product to include product_tag in free version
+            if ( 'product' === $post_type && ! isset( $this->wp_post_types[ $post_type ]['product_tag'] ) ) {
+                // Add product_tag as a canonical field for WooCommerce forms
+                $this->wp_post_types[ $post_type ]['product_tag'] = [
+                    'title'        => __( 'Product Tags', 'wp-user-frontend' ),
+                    'hierarchical' => false,
+                    'terms'        => [],
+                ];
+            }
+            
+            // Special handling for download to include download_tag in free version
+            if ( 'download' === $post_type && ! isset( $this->wp_post_types[ $post_type ]['download_tag'] ) ) {
+                // Add download_tag as a canonical field for EDD forms
+                $this->wp_post_types[ $post_type ]['download_tag'] = [
+                    'title'        => __( 'Download Tags', 'wp-user-frontend' ),
+                    'hierarchical' => false,
+                    'terms'        => [],
+                ];
+            }
         }
     }
 
@@ -498,6 +528,20 @@ function ( $term_name ) use ( $taxonomy ) {
                     register_taxonomy_for_object_type( 'post_tag', 'tribe_events' );
                 }
                 
+                // Auto-register product_tag taxonomy for product if not already registered
+                if ( 'product' === $this->form_settings['post_type'] && 
+                     'product_tag' === $taxonomy['name'] && 
+                     ! is_object_in_taxonomy( $this->form_settings['post_type'], $taxonomy['name'] ) ) {
+                    register_taxonomy_for_object_type( 'product_tag', 'product' );
+                }
+                
+                // Auto-register download_tag taxonomy for download if not already registered
+                if ( 'download' === $this->form_settings['post_type'] && 
+                     'download_tag' === $taxonomy['name'] && 
+                     ! is_object_in_taxonomy( $this->form_settings['post_type'], $taxonomy['name'] ) ) {
+                    register_taxonomy_for_object_type( 'download_tag', 'download' );
+                }
+                
                 if ( is_object_in_taxonomy( $this->form_settings['post_type'], $taxonomy['name'] ) ) {
                     $tax = $taxonomy_name;
                     // if it's not an array, make it one