Index: branches/RC/core/admin_templates/config/config_email.tpl
===================================================================
diff -u -N -r11132 -r11133
--- branches/RC/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 11132)
+++ branches/RC/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 11133)
@@ -13,7 +13,7 @@
   			//do not rename - this function is used in default grid for double click!
   			function edit()
   			{
-  				openSelector('emailevents.module', '<inp2:m_t t="users/user_selector" pass="all,emailevents.module" escape="1"/>', 'FromUserId', null, 'OnSaveSelected');
+  				openSelector('emailevents.module', '<inp2:m_t t="user_selector" pass="all,emailevents.module" escape="1"/>', 'FromUserId', null, 'OnSaveSelected');
   			}
 
   			var a_toolbar = new ToolBar();
Index: branches/RC/kernel/admin_templates/groups/groups_edit_users.tpl
===================================================================
diff -u -N -r11131 -r11133
--- branches/RC/kernel/admin_templates/groups/groups_edit_users.tpl	(.../groups_edit_users.tpl)	(revision 11131)
+++ branches/RC/kernel/admin_templates/groups/groups_edit_users.tpl	(.../groups_edit_users.tpl)	(revision 11133)
@@ -76,11 +76,13 @@
 </table>
 
 <inp2:m_DefineElement name="grid_membership_td">
-	<inp2:m_if check="Field" name="$field" db="db">
-		<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
-	<inp2:m_else/>
-		<inp2:m_phrase name="la_NeverExpires"/>
-	</inp2:m_if>
+	<td>
+		<inp2:m_if check="Field" name="$field" db="db">
+			<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
+		<inp2:m_else/>
+			<inp2:m_phrase name="la_NeverExpires"/>
+		</inp2:m_if>
+	</td>
 </inp2:m_DefineElement>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="g-ug" IdField="PortalUserId" grid="GroupUsers" menu_filters="yes" limited_heights="1"/>
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11132 -r11133
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11132)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11133)
@@ -420,7 +420,7 @@
 			<inp2:m_if check="m_ParamEquals" name="old_style" value="1">
 				<a href="#" onclick="return OpenUserSelector('','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');">
 			<inp2:m_else/>
-				<a href="javascript:openSelector('<inp2:m_param name="prefix"/>', '<inp2:m_t t="users/user_selector" pass="all,$prefix" escape="1"/>', '<inp2:m_param name="field"/>');">
+				<a href="javascript:openSelector('<inp2:m_param name="prefix"/>', '<inp2:m_t t="user_selector" pass="all,$prefix" escape="1"/>', '<inp2:m_param name="field"/>');">
 			</inp2:m_if>
           		 <img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
          	</a>