diff --git a/includes/admin/assets/js/um-admin-field.js b/includes/admin/assets/js/um-admin-field.js
index 606f04a8..6fd9c415 100644
--- a/includes/admin/assets/js/um-admin-field.js
+++ b/includes/admin/assets/js/um-admin-field.js
@@ -31,29 +31,29 @@ jQuery(document).ready(function() {
 	jQuery(document).on('submit', 'form.um_add_field', function(e){
 
 		e.preventDefault();
-        var conditions = $('.um-admin-cur-condition');
+        var conditions = jQuery('.um-admin-cur-condition');
         //need fields refactor
-        $(conditions).each( function ( i ) {
+        jQuery(conditions).each( function ( i ) {
 
-            if ( $( this ).find('[id^="_conditional_action"]').val() === '' ||
-                $( this ).find('[id^="_conditional_field"]').val() === '' ||
-                $( this ).find('[id^="_conditional_operator"]').val() ==='' )
+            if ( jQuery( this ).find('[id^="_conditional_action"]').val() === '' ||
+                jQuery( this ).find('[id^="_conditional_field"]').val() === '' ||
+                jQuery( this ).find('[id^="_conditional_operator"]').val() ==='' )
             {
-                $(conditions[i]).find('.um-admin-remove-condition').click();
+                jQuery(conditions[i]).find('.um-admin-remove-condition').click();
             }
         } );
-        conditions = $('.um-admin-cur-condition');
-        $(conditions).each( function ( i ) {
+        conditions = jQuery('.um-admin-cur-condition');
+        jQuery(conditions).each( function ( i ) {
             var id = i === 0 ? '' : i;
 
-			$( this ).find('[id^="_conditional_action"]').attr('name', '_conditional_action' + id);
-			$( this ).find('[id^="_conditional_action"]').attr('id', '_conditional_action' + id);
-			$( this ).find('[id^="_conditional_field"]').attr('name', '_conditional_field' + id);
-			$( this ).find('[id^="_conditional_field"]').attr('id', '_conditional_field' + id);
-			$( this ).find('[id^="_conditional_operator"]').attr('name', '_conditional_operator' + id);
-			$( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
-			$( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
-			$( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
+			jQuery( this ).find('[id^="_conditional_action"]').attr('name', '_conditional_action' + id);
+			jQuery( this ).find('[id^="_conditional_action"]').attr('id', '_conditional_action' + id);
+			jQuery( this ).find('[id^="_conditional_field"]').attr('name', '_conditional_field' + id);
+			jQuery( this ).find('[id^="_conditional_field"]').attr('id', '_conditional_field' + id);
+			jQuery( this ).find('[id^="_conditional_operator"]').attr('name', '_conditional_operator' + id);
+			jQuery( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
+			jQuery( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
+			jQuery( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
 
         } );
 		var form = jQuery(this);
diff --git a/includes/admin/assets/js/um-admin-modal.js b/includes/admin/assets/js/um-admin-modal.js
index 067044d4..b67d520e 100644
--- a/includes/admin/assets/js/um-admin-modal.js
+++ b/includes/admin/assets/js/um-admin-modal.js
@@ -222,17 +222,17 @@ jQuery(document).ready(function() {
 			alert( 'You already have 5 rules' );
 		}
 		//need fields refactor
-        var conditions = $('.um-admin-cur-condition');
-		$(conditions).each( function ( i ) {
+        var conditions = jQuery('.um-admin-cur-condition');
+		jQuery(conditions).each( function ( i ) {
 			id = i === 0 ? '' : i;
-			$( this ).find('[id^="_conditional_action"]').attr('name', '_conditional_action' + id);
-			$( this ).find('[id^="_conditional_action"]').attr('id', '_conditional_action' + id);
-			$( this ).find('[id^="_conditional_field"]').attr('name', '_conditional_field' + id);
-			$( this ).find('[id^="_conditional_field"]').attr('id', '_conditional_field' + id);
-			$( this ).find('[id^="_conditional_operator"]').attr('name', '_conditional_operator' + id);
-			$( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
-			$( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
-			$( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
+			jQuery( this ).find('[id^="_conditional_action"]').attr('name', '_conditional_action' + id);
+			jQuery( this ).find('[id^="_conditional_action"]').attr('id', '_conditional_action' + id);
+			jQuery( this ).find('[id^="_conditional_field"]').attr('name', '_conditional_field' + id);
+			jQuery( this ).find('[id^="_conditional_field"]').attr('id', '_conditional_field' + id);
+			jQuery( this ).find('[id^="_conditional_operator"]').attr('name', '_conditional_operator' + id);
+			jQuery( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
+			jQuery( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
+			jQuery( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
         } );
 
 	});
@@ -259,17 +259,17 @@ jQuery(document).ready(function() {
 		jQuery('.tipsy').remove();
 		condition.remove();
         //need fields refactor
-        var conditions = $('.um-admin-cur-condition');
-        $(conditions).each( function ( i ) {
+        var conditions = jQuery('.um-admin-cur-condition');
+        jQuery(conditions).each( function ( i ) {
             id = i === 0 ? '' : i;
-            $( this ).find('[id^="_conditional_action"]').attr('name', '_conditional_action' + id);
-            $( this ).find('[id^="_conditional_action"]').attr('id', '_conditional_action' + id);
-            $( this ).find('[id^="_conditional_field"]').attr('name', '_conditional_field' + id);
-            $( this ).find('[id^="_conditional_field"]').attr('id', '_conditional_field' + id);
-            $( this ).find('[id^="_conditional_operator"]').attr('name', '_conditional_operator' + id);
-            $( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
-            $( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
-            $( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
+            jQuery( this ).find('[id^="_conditional_action"]').attr('name', '_conditional_action' + id);
+            jQuery( this ).find('[id^="_conditional_action"]').attr('id', '_conditional_action' + id);
+            jQuery( this ).find('[id^="_conditional_field"]').attr('name', '_conditional_field' + id);
+            jQuery( this ).find('[id^="_conditional_field"]').attr('id', '_conditional_field' + id);
+            jQuery( this ).find('[id^="_conditional_operator"]').attr('name', '_conditional_operator' + id);
+            jQuery( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
+            jQuery( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
+            jQuery( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
         } );
 		um_admin_live_update_scripts();
 		um_admin_modal_responsive();