diff --git a/config.yml b/config.yml
index 72b24cc0..4a48fa90 100644
--- a/config.yml
+++ b/config.yml
@@ -86,6 +86,7 @@ DyeableWolf: false
 # Such as prophunt. Its also false because its kind of a retarded feature.
 # This is pretty simple. It shows the players displayname (Name as it appears in chat) above their head.
 # This also overrides any custom name they have set in their disguise options.
+# This does not take effect on player disguises
 ShowNamesAboveDisguises: false
 
 # This supports the above option.
diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/me/libraryaddict/disguise/DisguiseAPI.java
index a8ed6d91..d633380a 100644
--- a/src/me/libraryaddict/disguise/DisguiseAPI.java
+++ b/src/me/libraryaddict/disguise/DisguiseAPI.java
@@ -390,7 +390,7 @@ public class DisguiseAPI {
      */
     public static boolean isViewSelfToggled(Entity entity) {
         return isDisguised(entity) ? getDisguise(entity).isSelfDisguiseVisible() :
-                Disguise.getViewSelf().contains(entity.getUniqueId());
+                !Disguise.getViewSelf().contains(entity.getUniqueId());
     }
 
     /**
@@ -422,7 +422,7 @@ public class DisguiseAPI {
             }
         }
 
-        if (toggled) {
+        if (!toggled) {
             if (!Disguise.getViewSelf().contains(entity.getUniqueId())) {
                 Disguise.getViewSelf().add(entity.getUniqueId());
             }