diff --git a/manager/templates/manager/index.html b/manager/templates/manager/index.html
index b8df6f0..8e527d7 100644
--- a/manager/templates/manager/index.html
+++ b/manager/templates/manager/index.html
@@ -24,10 +24,10 @@
 
 			{% for device in devices %}
 			<tr>
-				<td><div style="display: inline; color: grey; font-weight: bold;" title="No information available" id="{{ device.id }}-indicator">&#11044;</div>&nbsp;<div style="display: inline;" id="{{ device.id }}-id">{{ device.serial }}</div></td>
+				<td><div style="display: inline; color: grey; font-weight: bold;" title="No information available" id="{{ device.id }}-indicator">&#11044;</div>&nbsp;<div style="display: inline;" {% if user.is_superuser %}title="{{device.organization.name}}"{% endif %} id="{{ device.id }}-id">{{ device.serial }}</div></td>
 				<td id="{{ device.id }}-name">{% if device.name %}{{ device.name }}{% endif %}</td>
 				<td id="{{ device.id }}-network">{{ device.network }}</td>
-				<td><div style="display:inline" id="{{ device.id }}-ip">{% if device.curip %}{{ device.curip }} (at {{ device.lasttime }}){% endif %}</div></td>
+				<td><div style="display:inline;" id="{{ device.id }}-ip">{% if device.curip %}{{ device.curip }} (at {{ device.lasttime }}){% endif %}</div></td>
 				<td><a href="/devices/{{ device.id }}/edit"><i class="fas fa-edit" title="Edit Device"></i></a> <a href="#"><i style="color: green;" onclick="askreboot({{ device.id }});" class="fas fa-sync" title="Reboot Device"></i></a>{% if user.is_staff %} <a onclick="downloadnotice();" href="/devices/{{ device.id }}/download"><i class="fas fa-download" title="Download Configuration"></i></a>{% endif %}{% if user.is_superuser %} <a href="#"><i style="color: darkred;" onclick="askdelete({{ device.id }});" class="fas fa-trash-alt" title="Delete Device"></i></a>{% endif %}</td>
 			</tr>
 			{% endfor %}
@@ -51,7 +51,7 @@
 
 			{% for wifi in wifis %}
 			<tr>
-				<td>{{ wifi.serial }}</td>
+				<td><div style="display:inline;" {% if user.is_superuser %}title="{{ wifi.organization.name }}"{% endif %}>{{ wifi.serial }}</div></td>
 				<td>{{ wifi.ssid }}</td>
 				<td><a href="/wifi/{{ wifi.id }}/edit"><i class="fas fa-edit" title="Edit WiFi"></i></a>{% if user.is_staff %} <a href="#"><i style="color: darkred;" onclick="askdeletewifi({{ wifi.id }});" class="fas fa-trash-alt" title="Delete WiFi"></i></a>{% endif %}</td>
 			</tr>
@@ -77,7 +77,7 @@
 
 			{% for auser in users %}
 			<tr>
-				<td>{% if auser.is_staff %}<b>{% endif %}{{ auser.username }}{% if auser.is_staff %}</b>{% endif %}</td>
+				<td><div style="display:inline;" {% if user.is_superuser %}title="{% for orga in auser.organizations %}{{ orga }}&#10;{% endfor %}"{% endif %}>{% if auser.is_staff %}<b>{% endif %}{{ auser.username }}{% if auser.is_staff %}</b>{% endif %}</div></td>
 				<td>{% if auser.is_staff %}<b>{% endif %}{{ auser.first_name }} {{ auser.last_name }}{% if auser.is_staff %}</b>{% endif %}</td>
 				<td><a href="/user/{{ auser.id }}/edit"><i class="fas fa-edit" title="Edit User"></i></a></td>
 			</tr>
diff --git a/manager/views.py b/manager/views.py
index 08fd3ce..26d23c0 100644
--- a/manager/views.py
+++ b/manager/views.py
@@ -268,6 +268,9 @@ def devices(request):
                 wifis.add(wifi)
             if user.is_staff:
                 for orgauser in User.objects.filter(organization=organization):
+                    orgauser.organizations = set()
+                    for orga in Organization.objects.filter(users=orgauser):
+                        orgauser.organizations.add(orga)
                     users.add(orgauser)
 
         return render(request, "manager/index.html",
diff --git a/vpnmanager/settings.py b/vpnmanager/settings.py
index cffad25..34aee4a 100644
--- a/vpnmanager/settings.py
+++ b/vpnmanager/settings.py
@@ -7,7 +7,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SECRET_KEY = '=go8&h#^kh6ksr11e2z-@4qqd6t%63$x#-!s#l_yhw@oyanrys'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ["admin360.kumi.host"]