diff --git a/admin/assets/js/um-admin-ajax.js b/admin/assets/js/um-admin-ajax.js
index e990f420..41f72cfb 100644
--- a/admin/assets/js/um-admin-ajax.js
+++ b/admin/assets/js/um-admin-ajax.js
@@ -5,7 +5,10 @@ jQuery(document).ready(function() {
 	});
 	
 	jQuery(document).on('click', 'a[data-silent_action^="um_"]',function(){
-	
+		
+		if ( typeof jQuery(this).attr('disabled') !== 'undefined' )
+			return false;
+		
 		in_row = '';
 		in_sub_row = '';
 		in_column = '';
@@ -50,4 +53,4 @@ jQuery(document).ready(function() {
 		
 	});
 
-});
\ No newline at end of file
+});
diff --git a/admin/core/um-admin-actions-modal.php b/admin/core/um-admin-actions-modal.php
index bff953d8..8ac00dcc 100644
--- a/admin/core/um-admin-actions-modal.php
+++ b/admin/core/um-admin-actions-modal.php
@@ -138,7 +138,7 @@
 			case 'um_admin_show_fields':
 				
 				ob_start();
-				
+				$form_fields = $ultimatemember->query->get_attr( 'custom_fields', $arg2 );
 				?>
 					
 					<h4><?php _e('Setup New Field','ultimatemember'); ?></h4>
@@ -167,7 +167,7 @@
 								if ( !isset( $array['account_only'] ) && !isset( $array['private_use'] ) ) {
 						?>
 						
-						<a href="#" class="button" data-silent_action="um_admin_add_field_from_predefined" data-arg1="<?php echo $field_key; ?>" data-arg2="<?php echo $arg2; ?>"><?php echo um_trim_string( stripslashes( $array['title'] ), 20 ); ?></a>
+						<a href="#" class="button" <?php disabled( in_array( $field_key, array_keys( $form_fields ) ) ) ?> data-silent_action="um_admin_add_field_from_predefined" data-arg1="<?php echo $field_key; ?>" data-arg2="<?php echo $arg2; ?>"><?php echo um_trim_string( stripslashes( $array['title'] ), 20 ); ?></a>
 
 						<?php } } } else { echo '<p>' . __('None','ultimatemember') . '</p>'; } ?>
 						
@@ -366,4 +366,4 @@
 		
 		if(is_array($output)){ print_r($output); }else{ echo $output; } die;
 		
-	}
\ No newline at end of file
+	}