diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index a47db8f..062e64a 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1048
\ No newline at end of file
+1054
\ No newline at end of file
diff --git a/IISMainHandler/HandlersFactory.cs b/IISMainHandler/HandlersFactory.cs
index 345b210..feaef32 100644
--- a/IISMainHandler/HandlersFactory.cs
+++ b/IISMainHandler/HandlersFactory.cs
@@ -83,17 +83,15 @@ namespace FLocal.IISHandler {
 				case "registerbyinvite":
 					return new handlers.response.RegisterByInviteHandler();
 				case "users":
-					if(context.requestParts.Length < 2) {
-						return new handlers.response.UserListHandler();
-					} else {
-						switch(context.requestParts[1].ToLower()) {
-							case "active":
-								return new handlers.response.ActiveAccountListHandler();
-							case "online":
-								return new handlers.response.WhoIsOnlineHandler();
-							default:
-								return new handlers.response.UserListHandler();
-						}
+					switch(context.requestParts[1].ToLower()) {
+						case "all":
+							return new handlers.response.UserListHandler();
+						case "active":
+							return new handlers.response.ActiveAccountListHandler();
+						case "online":
+							return new handlers.response.WhoIsOnlineHandler();
+						default:
+							return new handlers.WrongUrlHandler();
 					}
 				case "user":
 					if(context.requestParts.Length < 2) {
diff --git a/IISMainHandler/handlers/AbstractGetHandler.cs b/IISMainHandler/handlers/AbstractGetHandler.cs
index 596e4fa..8fdf8c1 100644
--- a/IISMainHandler/handlers/AbstractGetHandler.cs
+++ b/IISMainHandler/handlers/AbstractGetHandler.cs
@@ -21,7 +21,8 @@ namespace FLocal.IISHandler.handlers {
 					new XElement("title", Config.instance.AppInfo),
 					new XElement("current", DateTime.Now.ToXml()),
 					context.exportSession(),
-					context.userSettings.skin.exportToXml()
+					context.userSettings.skin.exportToXml(),
+					new XElement("currentUrl", "/" + String.Join("/", context.requestParts) + "/")
 				)
 			);
 		}
diff --git a/IISMainHandler/handlers/response/UserListHandler.cs b/IISMainHandler/handlers/response/UserListHandler.cs
index f857c31..fd33133 100644
--- a/IISMainHandler/handlers/response/UserListHandler.cs
+++ b/IISMainHandler/handlers/response/UserListHandler.cs
@@ -19,7 +19,7 @@ namespace FLocal.IISHandler.handlers.response {
 		}
 
 		override protected IEnumerable<XElement> getSpecificData(WebContext context) {
-			PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.usersPerPage, 1);
+			PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.usersPerPage, 2);
 			IEnumerable<User> users = User.getUsers(pageOuter);
 			return new XElement[] {
 				new XElement("users", 
diff --git a/static/css/global.css b/static/css/global.css
index a9ac0e9..8d724ba 100644
--- a/static/css/global.css
+++ b/static/css/global.css
@@ -112,3 +112,6 @@ p {
 	color:red !important;
 	text-decoration: line-through;
 }
+.currentLink {
+	border: solid 3px;
+}
diff --git a/templates/Full/UserList.xslt b/templates/Full/UserList.xslt
index 3f76f3f..47da58f 100644
--- a/templates/Full/UserList.xslt
+++ b/templates/Full/UserList.xslt
@@ -65,7 +65,7 @@
 										<td>
 											<xsl:text>страницы:</xsl:text>
 											<xsl:apply-templates select="users/pageOuter" mode="withCurrent">
-												<xsl:with-param name="baseLink">/Users/</xsl:with-param>
+												<xsl:with-param name="baseLink">/Users/All/</xsl:with-param>
 											</xsl:apply-templates>
 										</td>
 									</tr>
diff --git a/templates/Full/elems/Header.xslt b/templates/Full/elems/Header.xslt
index 9a73dc4..071c2c7 100644
--- a/templates/Full/elems/Header.xslt
+++ b/templates/Full/elems/Header.xslt
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
+
+	<xsl:template name="headerLink">
+		<xsl:param name="url"/>
+		<xsl:param name="text"/>
+		<xsl:param name="isDisabled"/>
+		<a target="_top">
+			<xsl:if test="not($isDisabled='true')">
+				<xsl:attribute name="href"><xsl:value-of select="$url"/>?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
+			</xsl:if>
+			<xsl:if test="starts-with(/root/currentUrl, $url)">
+				<xsl:attribute name="class">currentLink</xsl:attribute>
+			</xsl:if>
+			<xsl:value-of select="$text"/>
+		</a>
+	</xsl:template>
+
 	<xsl:template name="header">
 		<table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1">
 			<tr>
@@ -7,14 +23,14 @@
 					<table width="100%" class="tableborders" cellpadding="3" cellspacing="1">
 						<tr>
 							<td align="center" class="menubar">
-								<a target="_top">
-									<xsl:attribute name="href">/Boards/?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
-									<xsl:text>Список форумов</xsl:text>
-								</a>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Boards/</xsl:with-param>
+									<xsl:with-param name="text">Список форумов</xsl:with-param>
+								</xsl:call-template>
 								<xsl:text> | </xsl:text>
-								<a target="_top">
-									<xsl:if test="session/sessionKey">
-										<xsl:attribute name="href">/Conversations/?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Conversations/</xsl:with-param>
+									<xsl:with-param name="text">
 										<xsl:if test="session/indicators/unreadPrivateMessages != '0'">
 											<img src="/static/images/newpm.gif" border="0">
 												<xsl:attribute name="alt">
@@ -24,40 +40,46 @@
 												</xsl:attribute>
 											</img>
 										</xsl:if>
-									</xsl:if>
-									<xsl:text>Личные сообщения</xsl:text>
-								</a>
+										<xsl:text>Личные сообщения</xsl:text>
+									</xsl:with-param>
+									<xsl:with-param name="isDisabled">
+										<xsl:if test="not(session/sessionKey)">true</xsl:if>
+									</xsl:with-param>
+								</xsl:call-template>
 								<xsl:text> | </xsl:text>
-								<a target="_top">
-									<xsl:if test="session/sessionKey">
-										<xsl:attribute name="href">/Upload/List/?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
-									</xsl:if>
-									<xsl:text>Аплоад</xsl:text>
-								</a>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Upload/List/</xsl:with-param>
+									<xsl:with-param name="text">Аплоад</xsl:with-param>
+									<xsl:with-param name="isDisabled">
+										<xsl:if test="not(session/sessionKey)">true</xsl:if>
+									</xsl:with-param>
+								</xsl:call-template>
 								<xsl:text> | </xsl:text>
-								<a target="_top">
-									<xsl:if test="session/sessionKey">
-										<xsl:attribute name="href">/Settings/</xsl:attribute>
-									</xsl:if>
-									<xsl:text>Настройки</xsl:text>
-								</a>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Settings/</xsl:with-param>
+									<xsl:with-param name="text">Настройки</xsl:with-param>
+									<xsl:with-param name="isDisabled">
+										<xsl:if test="not(session/sessionKey)">true</xsl:if>
+									</xsl:with-param>
+								</xsl:call-template>
 								<xsl:text> | </xsl:text>
-								<a target="_top">
-									<xsl:if test="session/notLoggedIn">
-										<xsl:attribute name="href">/Login/</xsl:attribute>
-									</xsl:if>
-									<xsl:text>Вход</xsl:text>
-								</a>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Login/</xsl:with-param>
+									<xsl:with-param name="text">Вход</xsl:with-param>
+									<xsl:with-param name="isDisabled">
+										<xsl:if test="session/sessionKey">true</xsl:if>
+									</xsl:with-param>
+								</xsl:call-template>
 								<xsl:text> | </xsl:text>
-								<a target="_top">
-									<xsl:attribute name="href">/Users/Online/?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
-									<xsl:text>Кто в онлайне</xsl:text>
-								</a>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Users/Online/</xsl:with-param>
+									<xsl:with-param name="text">Кто в онлайне</xsl:with-param>
+								</xsl:call-template>
 								<xsl:text> | </xsl:text>
-								<a target="_top">
-									<xsl:attribute name="href">/q/faq</xsl:attribute>
-									<xsl:text>FAQ</xsl:text>
-								</a>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/q/faq/</xsl:with-param>
+									<xsl:with-param name="text">FAQ</xsl:with-param>
+								</xsl:call-template>
 								<xsl:text> | </xsl:text>
 								<a target="_top">
 									<xsl:if test="session/sessionKey">
@@ -66,7 +88,10 @@
 									<xsl:text>Выход</xsl:text>
 								</a>
 								<xsl:text> | </xsl:text>
-								<a href="/Users/" target="_top">Пользователи</a>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Users/All/</xsl:with-param>
+									<xsl:with-param name="text">Пользователи</xsl:with-param>
+								</xsl:call-template>
 							</td>
 						</tr>
 					</table>