diff --git a/user.js b/user.js
index 8dec1941..e886d63b 100644
--- a/user.js
+++ b/user.js
@@ -204,8 +204,10 @@ User.prototype.initCallbacks = function() {
 
     this.socket.on("chatMsg", function(data) {
         if(this.channel != null) {
-            this.setAFK(false);
-            this.autoAFK();
+            if(data.msg.indexOf("/afk") == -1) {
+                this.setAFK(false);
+                this.autoAFK();
+            }
             this.channel.tryChat(this, data);
         }
     }.bind(this));
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 36712689..ec5ad9c9 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -837,7 +837,7 @@ function handlePermissionChange() {
         hasPermission("playlistjump") ||
         hasPermission("playlistdelete") ||
         hasPermission("settemp")) {
-        if(USEROPTS.first_visit) {
+        if(USEROPTS.first_visit && $("#plonotification").length == 0) {
             var al = makeAlert("Playlist Options", [
                 "From the Options menu, you can choose to automatically",
                 " hide the buttons on each entry (and show them when",
@@ -845,6 +845,7 @@ function handlePermissionChange() {
                 " style of playlist buttons.",
                 "<br>"].join(""))
                 .addClass("span12")
+                .attr("id", "plonotification")
                 .insertBefore($("#queue"));
 
             al.find(".close").remove();