diff --git a/templates/Full/Boards.xslt b/templates/Full/Boards.xslt
index 0cc0635..1f4bb7e 100644
--- a/templates/Full/Boards.xslt
+++ b/templates/Full/Boards.xslt
@@ -26,10 +26,7 @@
 										<xsl:choose>
 											<xsl:when test="session/user">
 												<xsl:text>Вы вошли в форум как </xsl:text>
-												<a>
-													<xsl:attribute name="href">/User/<xsl:value-of select="session/user/id"/>/</xsl:attribute>
-													<xsl:value-of select="session/user/name"/>
-												</a>
+												<xsl:apply-templates select="session/user" mode="userLink"/>
 											</xsl:when>
 											<xsl:otherwise>
 												<xsl:text>Вы не вошли в форум</xsl:text>
diff --git a/templates/Full/UserList.xslt b/templates/Full/UserList.xslt
index dc23090..3f76f3f 100644
--- a/templates/Full/UserList.xslt
+++ b/templates/Full/UserList.xslt
@@ -89,10 +89,7 @@
 				</xsl:otherwise>
 			</xsl:choose>
 			<td>
-				<a>
-					<xsl:attribute name="href">/User/<xsl:value-of select="id"/>/</xsl:attribute>
-					<xsl:value-of select="name"/>
-				</a>
+				<xsl:apply-templates select="current()" mode="userLink"/>
 			</td>
 			<td>
 				<xsl:text>Пользователь</xsl:text>
diff --git a/templates/Full/UserPosts.xslt b/templates/Full/UserPosts.xslt
index 365dac2..e8dfdf7 100644
--- a/templates/Full/UserPosts.xslt
+++ b/templates/Full/UserPosts.xslt
@@ -22,10 +22,7 @@
 													<xsl:text>Пользователи</xsl:text>
 												</a>
 												<xsl:text> &gt;&gt; </xsl:text>
-												<a>
-													<xsl:attribute name="href">/User/<xsl:value-of select="user/id"/></xsl:attribute>
-													<xsl:value-of select="user/name"/>
-												</a>
+												<xsl:apply-templates select="user" mode="userLink"/>
 												<xsl:text> &gt;&gt; </xsl:text>
 												<xsl:text>Посты</xsl:text>
 											</font>
diff --git a/templates/Full/UserReplies.xslt b/templates/Full/UserReplies.xslt
index 048c608..64eb97b 100644
--- a/templates/Full/UserReplies.xslt
+++ b/templates/Full/UserReplies.xslt
@@ -22,10 +22,7 @@
 													<xsl:text>Пользователи</xsl:text>
 												</a>
 												<xsl:text> &gt;&gt; </xsl:text>
-												<a>
-													<xsl:attribute name="href">/User/<xsl:value-of select="user/id"/></xsl:attribute>
-													<xsl:value-of select="user/name"/>
-												</a>
+												<xsl:apply-templates select="user" mode="userLink"/>
 												<xsl:text> &gt;&gt; </xsl:text>
 												<xsl:text>Ответы</xsl:text>
 											</font>
diff --git a/templates/Full/elems/Main.xslt b/templates/Full/elems/Main.xslt
index 7df4470..8f32690 100644
--- a/templates/Full/elems/Main.xslt
+++ b/templates/Full/elems/Main.xslt
@@ -154,5 +154,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="user" mode="userLink">
+		<a class="separate">
+			<xsl:attribute name="href">/User/<xsl:value-of select="id"/>/</xsl:attribute>
+			<xsl:value-of select="name"/>
+		</a>
+	</xsl:template>
+
 </xsl:stylesheet>
 
diff --git a/templates/Full/elems/PollInfo.xslt b/templates/Full/elems/PollInfo.xslt
index 1b6a954..1bf7dc7 100644
--- a/templates/Full/elems/PollInfo.xslt
+++ b/templates/Full/elems/PollInfo.xslt
@@ -158,11 +158,4 @@
 		</tr>
 	</xsl:template>
 
-	<xsl:template match="user" mode="userLink">
-		<a class="separate">
-			<xsl:attribute name="href">/User/<xsl:value-of select="id"/>/</xsl:attribute>
-			<xsl:value-of select="name"/>
-		</a>
-	</xsl:template>
-
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Full/elems/ThreadInfo.xslt b/templates/Full/elems/ThreadInfo.xslt
index 4573b62..ecf381f 100644
--- a/templates/Full/elems/ThreadInfo.xslt
+++ b/templates/Full/elems/ThreadInfo.xslt
@@ -53,13 +53,7 @@
 				</xsl:if>
 			</td>
 			<td align="left" nowrap="nowrap">
-				<a>
-					<xsl:attribute name="href">/User/<xsl:value-of select="topicstarter/user/id"/>/</xsl:attribute>
-					<font>
-						<xsl:attribute name="color">#0000ff</xsl:attribute>
-						<xsl:value-of select="topicstarter/user/name"/>
-					</font>
-				</a>
+				<xsl:apply-templates select="topicstarter/user" mode="userLink"/>
 			</td>
 			<td align="center">
 				<xsl:value-of select="totalViews"/>
diff --git a/templates/Full/elems/UploadInfo.xslt b/templates/Full/elems/UploadInfo.xslt
index b32121e..eacc341 100644
--- a/templates/Full/elems/UploadInfo.xslt
+++ b/templates/Full/elems/UploadInfo.xslt
@@ -60,5 +60,4 @@
 		</tr>
 	</xsl:template>
 
-
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Full/elems/UserInfoBar.xslt b/templates/Full/elems/UserInfoBar.xslt
index b3c8024..092fcda 100644
--- a/templates/Full/elems/UserInfoBar.xslt
+++ b/templates/Full/elems/UserInfoBar.xslt
@@ -5,10 +5,7 @@
 		<table border="0" cellpadding="0" cellspacing="0">
 			<tr>
 				<td>
-					<a>
-						<xsl:attribute name="href">/User/<xsl:value-of select="id"/>/</xsl:attribute>
-						<xsl:value-of select="name"/>
-					</a>
+					<xsl:apply-templates select="current()" mode="userLink"/>
 				</td>
 			</tr>
 			<tr>