diff --git a/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars
index 80680bde..e0e6721e 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars
@@ -31,7 +31,15 @@
             </div>
 
             {{#if operator}}
-                <div id="path"><p>{{l10n "You are {0}" operator}}</p></div>
+                <div id="path">
+                    <p>
+                        {{#if currentopid}}
+                            {{{l10n "You are <a href=\"{0}\">{1}</a>" (route "operator_edit" operator_id=currentopid) operator}}}
+                        {{else}}
+                            {{{l10n "You are <a href=\"{0}\">{1}</a>" "#" operator}}}
+                        {{/if}}
+                    </p>
+                </div>
             {{else}}
                 {{#if show_small_login}}
                     <div id="login-small-pane">
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars
index f93ca7e9..b7360281 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars
@@ -38,9 +38,6 @@
                     <li{{#ifEqual menuid "mail_templates"}} class="active"{{/ifEqual}}><a href="{{route "mail_templates"}}">{{l10n "Mail templates"}}</a></li>
                     <li{{#ifEqual menuid "about"}} class="active"{{/ifEqual}}><a href="{{route "about"}}">{{l10n "About"}}</a></li>
                 {{/if}}
-                {{#if currentopid}}
-                    <li{{#ifEqual menuid "profile"}} class="active"{{/ifEqual}}><a href="{{route "operator_edit" operator_id=currentopid}}">{{l10n "Profile"}}</a></li>
-                {{/if}}
             </ul>
         </li>
         <li>