Index: trunk/themes/default/misc/right_loggedin.tpl
===================================================================
diff -u -N -r2709 -r2765
--- trunk/themes/default/misc/right_loggedin.tpl	(.../right_loggedin.tpl)	(revision 2709)
+++ trunk/themes/default/misc/right_loggedin.tpl	(.../right_loggedin.tpl)	(revision 2765)
@@ -41,10 +41,12 @@
 							  <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">
-							<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 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>
 							<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>
Index: trunk/themes/default/my_account.tpl
===================================================================
diff -u -N -r2702 -r2765
--- trunk/themes/default/my_account.tpl	(.../my_account.tpl)	(revision 2702)
+++ trunk/themes/default/my_account.tpl	(.../my_account.tpl)	(revision 2765)
@@ -166,10 +166,12 @@
 											</td>
 											<td>&nbsp;</td>
 										</tr>
+										<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>
 										<tr>
-											<inp:perm_include _Module="In-Commerce" _Template="in-commerce/blocks/my_account/my_affiliate_link.tpl" />
-										</tr>
-										<tr>
 											<td colspan="4"><img src="img/s.gif" width="1" height="10" alt="" /><br /></td>
 										</tr>
 										<tr>