diff --git a/source/libublsettingsui-gtk3-save.c b/source/libublsettingsui-gtk3-save.c
index a6752a3..41cbc8c 100644
--- a/source/libublsettingsui-gtk3-save.c
+++ b/source/libublsettingsui-gtk3-save.c
@@ -430,7 +430,11 @@ void yon_save_window_loaded_config_init(template_saving_window *window, struct l
                     GtkTreeIter iter;
                     if (status==0||status==-2) status = 0;
                     else status=1;
-                    char *compare_string = yon_char_unite("\n",(char*)current->data,NULL);
+                        char *old_val = yon_char_new(current->data);
+                        if (strstr(old_val,"&")) {old_val = yon_char_replace(old_val,"&","\003");old_val = yon_char_replace(old_val,"\003","&");}
+                        if (strstr(old_val,">")) old_val = yon_char_replace(old_val,">","<");
+                        if (strstr(old_val,"<")) old_val = yon_char_replace(old_val,"<","&gt;");
+                    char *compare_string = yon_char_unite("\n",(char*)old_val,NULL);
                     gtk_list_store_append(window->list,&iter);
                     gtk_list_store_set(window->list,&iter,0,status,1,current->key,3,(char*)current->data,4,compare_string,6,1,7,yon_config_get_section_for_key(current->key),-1);
                     free(compare_string);
diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c
index db82ca4..5be9e88 100644
--- a/source/libublsettingsui-gtk3.c
+++ b/source/libublsettingsui-gtk3.c
@@ -600,8 +600,11 @@ void yon_entry_set_entry_type(GtkEntry *target,GtkBox *status){
             g_signal_connect(G_OBJECT(target),"insert-text",G_CALLBACK(yon_on_digit_only_changed),NULL);
 
         break;
-        case GTK_INPUT_PURPOSE_NAME:
         case GTK_INPUT_PURPOSE_EMAIL:
+            yon_gtk_entry_block_restricted_symbols(target);
+            yon_gtk_entry_block_languages(target);
+            break;
+        case GTK_INPUT_PURPOSE_NAME:
         case GTK_INPUT_PURPOSE_URL:
             yon_gtk_entry_block_restricted_symbols(target);