diff --git a/pages/configure_links.php b/pages/configure_links.php
index 67d631f..11a69df 100644
--- a/pages/configure_links.php
+++ b/pages/configure_links.php
@@ -74,11 +74,11 @@
 	if ( $t_custom_field_def['type'] == CUSTOM_FIELD_TYPE_ENUM ||
 		 $t_custom_field_def['type'] == CUSTOM_FIELD_TYPE_MULTILIST)
 	{
-		echo '<td>'. string_display_line( $t_custom_field_def['name'] ).'</td>';
+		echo '<td>'. string_attribute( $t_custom_field_def['name'] ).'</td>';
 		$t_linked_field_id = LinkedCustomFieldsDao::getLinkedFieldId( $t_custom_field );
 		if ( $t_linked_field_id ) {
 			$t_linked_field = custom_field_get_definition( $t_linked_field_id );
-			echo '<td>' . $t_linked_field['name'] .'</td>';
+			echo '<td>' . string_attribute($t_linked_field['name']) .'</td>';
 		} else {
 			echo '<td> None </td>';
 	}
diff --git a/pages/link_edit.php b/pages/link_edit.php
index fe371a4..47f28ba 100644
--- a/pages/link_edit.php
+++ b/pages/link_edit.php
@@ -74,7 +74,7 @@
 							<tbody>
 								<tr>
 									<th class="width-30"><?php echo plugin_lang_get('custom_field') ?></th>
-									<td><?php echo $f_custom_field['name'] ?></td>
+									<td><?php echo string_attribute($f_custom_field['name']) ?></td>
 								</tr>
 								<tr>
 									<th>
@@ -95,7 +95,7 @@
 
 		$t_selected = $t_target_field_id == $t_target_candidate['id'] ? ' selected="selected"' : "";
 
-		echo '<option' . $t_selected . ' value="' . $t_target_candidate['id'] .'">'.$t_target_candidate['name'].'</option>';
+		echo '<option' . $t_selected . ' value="' . $t_target_candidate['id'] .'">'. string_attribute($t_target_candidate['name']) .'</option>';
 	}
 ?>
 										</select>
@@ -126,7 +126,7 @@
 			</div>
 
 			<div class="widget-toolbox padding-8 clearfix">
-				<?php echo sprintf( plugin_lang_get( 'warning_no_mapping' ), $f_custom_field['name'] ) ; ?>
+				<?php echo sprintf( plugin_lang_get( 'warning_no_mapping' ), string_attribute($f_custom_field['name']) ) ; ?>
 			</div>
 
 			<div class="widget-body">
@@ -143,7 +143,7 @@
 <?php foreach( explode('|', $f_custom_field['possible_values'] ) as $t_idx => $t_possible_value ) { ?>
 								<tr>
 									<td id="source_field_value_<?php echo $t_idx ?>">
-										<?php echo $t_possible_value ?>
+										<?php echo string_attribute($t_possible_value) ?>
 									</td>
 									<td>
 										<!--suppress HtmlFormInputWithoutLabel -->