Index: branches/RC/themes/default/misc/right_loggedin.tpl
===================================================================
diff -u -r8929 -r9405
--- branches/RC/themes/default/misc/right_loggedin.tpl	(.../right_loggedin.tpl)	(revision 8929)
+++ branches/RC/themes/default/misc/right_loggedin.tpl	(.../right_loggedin.tpl)	(revision 9405)
@@ -40,14 +40,14 @@
 							  <td align="center"><a href="<inp:m_template_link _Template="my_preferences" />"><img src="img/ic_mypreferences.gif" width="22" height="18" alt="" /></a><br /></td>
 							  <td class="item-my"><a href="<inp:m_template_link _Template="my_preferences" />"><inp:m_language _Phrase="lu_my_preferences" /></a></td>
 							</tr>
-							<inp:m_module_enabled _Module="In-Commerce">
+							<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
 								<inp2:m_if check="u_IsAffiliateOrRegisterAsAffiliateAllowed">
 									<tr>
 									    <td align="center"><a href="<inp2:m_Link template="in-commerce/your_account/affiliate" />"><img src="img/my_affiliate_s.gif" width="22" height="19" alt="" /></a><br /></td>
 									    <td class="item-my"><a href="<inp2:m_Link template="in-commerce/your_account/affiliate" />"><inp2:m_phrase label="lu_my_affiliate_section" /></a></td>
 									</tr>
 								</inp2:m_if>
-							</inp:m_module_enabled>
+							</inp2:m_if>
 							<tr>
 							  <td align="center"><a href="<inp:m_logout_link _Tenplate="index" _Category=0 />"><img src="img/ic_logout.gif" width="22" height="23" alt="" /></a><br /></td>
 							  <td class="item-my"><a href="<inp:m_logout_link _Tenplate="index" _Category=0 />"><inp:m_language _Phrase="lu_logout" /></a></td>
Index: branches/RC/themes/default/my_account.tpl
===================================================================
diff -u -r8929 -r9405
--- branches/RC/themes/default/my_account.tpl	(.../my_account.tpl)	(revision 8929)
+++ branches/RC/themes/default/my_account.tpl	(.../my_account.tpl)	(revision 9405)
@@ -167,11 +167,13 @@
 											</td>
 											<td>&nbsp;</td>
 										</tr>
+									<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
 										<inp2:m_if check="u_IsAffiliateOrRegisterAsAffiliateAllowed">
 											<tr>
 												<inp:perm_include _Module="In-Commerce" _Template="in-commerce/blocks/my_account/my_affiliate_link.tpl" />
 											</tr>
 										</inp2:m_if>
+									</inp2:m_if>
 										<tr>
 											<td colspan="4"><img src="img/s.gif" width="1" height="10" alt="" /><br /></td>
 										</tr>