diff --git a/templates/useroptions.pug b/templates/useroptions.pug
index 4dd20939..47bbc06d 100644
--- a/templates/useroptions.pug
+++ b/templates/useroptions.pug
@@ -100,6 +100,10 @@ mixin us-chat
       +rcheckbox("us-sort-rank", "Sort userlist by rank")
       +rcheckbox("us-sort-afk", "Sort AFKers to bottom")
       .col-sm-4
+      .col-sm-8
+        p.text-info The following option only applies if you have permission to see IP addresses in the first place.
+      +rcheckbox("us-no-ip-on-hover", "Disable revealing user IP addresses in profile tooltip")
+      .col-sm-4
       .col-sm-8
         p.text-info The following 3 options apply to how and when you will be notified if a new chat message is received while CyTube is not the active window.
       .form-group
diff --git a/www/js/util.js b/www/js/util.js
index 6765be59..2fe23e91 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -144,7 +144,7 @@ function formatUserlistItem(div) {
         $("<strong/>").text(data.name).appendTo(profile);
 
         var meta = div.data("meta") || {};
-        if (meta.ip) {
+        if (meta.ip && !USEROPTS.disable_ip_tooltip) {
             $("<br/>").appendTo(profile);
             $("<em/>").text(meta.ip).appendTo(profile);
         }
@@ -668,6 +668,7 @@ function saveUserOptions() {
     USEROPTS.layout               = $("#us-layout").val();
     USEROPTS.ignore_channelcss    = $("#us-no-channelcss").prop("checked");
     USEROPTS.ignore_channeljs     = $("#us-no-channeljs").prop("checked");
+    USEROPTS.disable_ip_tooltip   = $("#us-no-ip-on-hover").prop("checked");
 
     USEROPTS.synch                = $("#us-synch").prop("checked");
     USEROPTS.sync_accuracy        = parseFloat($("#us-synch-accuracy").val()) || 2;