Index: branches/5.2.x/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -N -r14663 -r16339
--- branches/5.2.x/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 14663)
+++ branches/5.2.x/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 16339)
@@ -33,7 +33,7 @@
 						'setprimary',
 						'<inp2:m_phrase label="la_ToolTip_PrimaryGroup" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_SetPrimary" escape="1"/>',
 						function() {
-							openSelector('u.regular', '<inp2:m_Link t="users/group_selector" pass="m,u"/>', 'PrimaryGroupId', '800x600', 'OnSaveSelected');
+							openSelector('u.regular', '<inp2:m_Link t="users/group_selector" pass="m,u" no_amp="1" js_escape="1"/>', 'PrimaryGroupId', '800x600', 'OnSaveSelected');
 						}
 					)
 				);*/
@@ -79,7 +79,7 @@
 							function() {
 								Application.SetVar('remove_specials[u.regular]', 1);
 								Application.SetVar('mailing_recipient_type', 'u');
-								openSelector('mailing-list', '<inp2:m_Link template="mailing_lists/mailing_list_edit"/>', 'UserEmail', null, 'OnNew');
+								openSelector('mailing-list', '<inp2:m_Link template="mailing_lists/mailing_list_edit" no_amp="1" js_escape="1"/>', 'UserEmail', null, 'OnNew');
 							}
 						)
 					);