diff --git a/src/Controller/TorrentController.php b/src/Controller/TorrentController.php
index a1ea018..76b09a7 100644
--- a/src/Controller/TorrentController.php
+++ b/src/Controller/TorrentController.php
@@ -109,10 +109,7 @@ class TorrentController extends AbstractController
         [
             'session' =>
             [
-                'user' => $user
-            ],
-            'user' =>
-            [
+                'user' => $user,
                 'id'        => $user->getId(),
                 'moderator' => $user->isModerator()
             ],
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index a11291a..574a1e4 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -210,11 +210,13 @@ class UserController extends AbstractController
             [
                 'session' =>
                 [
-                    'user' => $user
+                    'user'      => $user,
+                    'owner'     => $user->getId() === $userTarget->getId(),
+                    'moderator' => $user->isModerator()
                 ],
                 'user' => [
                     'id'        => $userTarget->getId(),
-                    'address'   => $userTarget->getId() === $user->getId() ? $userTarget->getAddress() : false,
+                    'address'   => $userTarget->getAddress(),
                     'moderator' => $userTarget->isModerator(),
                     'approved'  => $userTarget->isApproved(),
                     'status'    => $userTarget->isStatus(),
diff --git a/templates/default/torrent/info.html.twig b/templates/default/torrent/info.html.twig
index bd09bf9..364ac67 100644
--- a/templates/default/torrent/info.html.twig
+++ b/templates/default/torrent/info.html.twig
@@ -73,7 +73,7 @@
         </div>
         <table class="width-100">
             <tbody>
-                {% if user.moderator %}
+                {% if session.moderator %}
                     <tr>
                         <td colspan="2">
                             <div class="padding-y-8-px border-bottom-default text-right">
diff --git a/templates/default/user/info.html.twig b/templates/default/user/info.html.twig
index 4ed5e35..8391fb9 100644
--- a/templates/default/user/info.html.twig
+++ b/templates/default/user/info.html.twig
@@ -33,7 +33,7 @@
                 <tr>
                     <td class="padding-y-8-px border-bottom-default text-right" colspan="2">{{ 'Common'|trans }}</td>
                 </tr>
-                {% if user.address %}
+                {% if session.owner or session.moderator %}
                     <tr>
                         <td class="padding-t-16-px">{{ 'Address' | trans }}</td>
                         <td class="padding-t-16-px">
@@ -68,7 +68,7 @@
                     <td class="padding-t-16-px">
                         {% if user.status %}
                             {{ 'Active' | trans }}
-                            {% if user.moderator %}
+                            {% if session.moderator %}
                                 <a class="float-right" href="{{ path('user_status_toggle', { userId : user.id }) }}" title="{{ 'Toggle' | trans }}">
                                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
                                         <path d="M5 3a5 5 0 0 0 0 10h6a5 5 0 0 0 0-10H5zm6 9a4 4 0 1 1 0-8 4 4 0 0 1 0 8z"/>
@@ -77,7 +77,7 @@
                             {% endif %}
                         {% else %}
                             {{ 'Disabled' | trans }}
-                            {% if user.moderator %}
+                            {% if session.moderator %}
                                 <a class="float-right text-color-red" href="{{ path('user_status_toggle', { userId : user.id }) }}" title="{{ 'Toggle' | trans }}">
                                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
                                         <path d="M11 4a4 4 0 0 1 0 8H8a4.992 4.992 0 0 0 2-4 4.992 4.992 0 0 0-2-4h3zm-6 8a4 4 0 1 1 0-8 4 4 0 0 1 0 8zM0 8a5 5 0 0 0 5 5h6a5 5 0 0 0 0-10H5a5 5 0 0 0-5 5z"/>
@@ -94,7 +94,7 @@
                     <td>
                         {% if user.approved %}
                             {{ 'Yes'| trans }}
-                            {% if user.moderator %}
+                            {% if session.moderator %}
                                 <a class="float-right" href="{{ path('user_approved_toggle', { userId : user.id }) }}" title="{{ 'Toggle' | trans }}">
                                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
                                         <path d="M5 3a5 5 0 0 0 0 10h6a5 5 0 0 0 0-10H5zm6 9a4 4 0 1 1 0-8 4 4 0 0 1 0 8z"/>
@@ -103,7 +103,7 @@
                             {% endif %}
                         {% else %}
                             {{ 'No'| trans }}
-                            {% if user.moderator %}
+                            {% if session.moderator %}
                                 <a class="float-right text-color-red" href="{{ path('user_approved_toggle', { userId : user.id }) }}" title="{{ 'Toggle' | trans }}">
                                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
                                         <path d="M11 4a4 4 0 0 1 0 8H8a4.992 4.992 0 0 0 2-4 4.992 4.992 0 0 0-2-4h3zm-6 8a4 4 0 1 1 0-8 4 4 0 0 1 0 8zM0 8a5 5 0 0 0 5 5h6a5 5 0 0 0 0-10H5a5 5 0 0 0-5 5z"/>
@@ -118,9 +118,9 @@
                         {{ 'Moderator' | trans }}
                     </td>
                     <td>
-                        {% if user.moderator %}
+                        {% if session.moderator %}
                             {{ 'Yes'| trans }}
-                            {% if user.moderator %}
+                            {% if session.moderator %}
                                 <a class="float-right" href="{{ path('user_moderator_toggle', { userId : user.id }) }}" title="{{ 'Toggle' | trans }}">
                                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
                                         <path d="M5 3a5 5 0 0 0 0 10h6a5 5 0 0 0 0-10H5zm6 9a4 4 0 1 1 0-8 4 4 0 0 1 0 8z"/>
@@ -129,7 +129,7 @@
                             {% endif %}
                         {% else %}
                             {{ 'No'| trans }}
-                            {% if user.moderator %}
+                            {% if session.moderator %}
                                 <a class="float-right text-color-red" href="{{ path('user_moderator_toggle', { userId : user.id }) }}" title="{{ 'Toggle' | trans }}">
                                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
                                         <path d="M11 4a4 4 0 0 1 0 8H8a4.992 4.992 0 0 0 2-4 4.992 4.992 0 0 0-2-4h3zm-6 8a4 4 0 1 1 0-8 4 4 0 0 1 0 8zM0 8a5 5 0 0 0 5 5h6a5 5 0 0 0 0-10H5a5 5 0 0 0-5 5z"/>