diff --git a/Essentials/src/com/earth2me/essentials/perm/impl/AbstractVaultHandler.java b/Essentials/src/com/earth2me/essentials/perm/impl/AbstractVaultHandler.java
index b2d381cdf..b10864400 100644
--- a/Essentials/src/com/earth2me/essentials/perm/impl/AbstractVaultHandler.java
+++ b/Essentials/src/com/earth2me/essentials/perm/impl/AbstractVaultHandler.java
@@ -46,23 +46,31 @@ public abstract class AbstractVaultHandler extends SuperpermsHandler {
     @Override
     public String getPrefix(final Player base) {
         String playerPrefix = chat.getPlayerPrefix(base);
-        if (playerPrefix == null) {
-            String playerGroup = perms.getPrimaryGroup(base);
-            return chat.getGroupPrefix(base.getWorld().getName(), playerGroup);
-        } else {
+        if (playerPrefix != null) {
             return playerPrefix;
         }
+
+        String playerGroup = perms.getPrimaryGroup(base);
+        if (playerGroup != null) {
+            return chat.getGroupPrefix(base.getWorld().getName(), playerGroup);
+        }
+
+        return null;
     }
 
     @Override
     public String getSuffix(final Player base) {
         String playerSuffix = chat.getPlayerSuffix(base);
-        if (playerSuffix == null) {
-            String playerGroup = perms.getPrimaryGroup(base);
-            return chat.getGroupSuffix(base.getWorld().getName(), playerGroup);
-        } else {
+        if (playerSuffix != null) {
             return playerSuffix;
         }
+
+        String playerGroup = perms.getPrimaryGroup(base);
+        if (playerGroup != null) {
+            return chat.getGroupSuffix(base.getWorld().getName(), playerGroup);
+        }
+
+        return null;
     }
 
     boolean canLoad() {