diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java
index 05c712d3..b717fbab 100644
--- a/src/com/massivecraft/factions/FPlayer.java
+++ b/src/com/massivecraft/factions/FPlayer.java
@@ -121,6 +121,15 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 	
 	// FIELD: chatMode
 	private ChatMode chatMode;
+	public void setChatMode(ChatMode chatMode) { this.chatMode = chatMode; }
+	public ChatMode getChatMode()
+	{
+		if(this.factionId.equals("0") || ! Conf.factionOnlyChat)
+		{
+			this.chatMode = ChatMode.PUBLIC;
+		}
+		return chatMode;
+	}
 	
 	// FIELD: account
 	public MethodAccount getAccount()
@@ -189,22 +198,6 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 	
 	
 	
-	
-	
-	public ChatMode getChatMode()
-	{
-		if(this.factionId.equals("0"))
-		{
-			return ChatMode.PUBLIC;
-		}
-		return chatMode;
-	}
-
-	public void setChatMode(ChatMode chatMode)
-	{
-		this.chatMode = chatMode;
-	}
-	
 	public long getLastLoginTime()
 	{
 		return lastLoginTime;
diff --git a/src/com/massivecraft/factions/cmd/CmdChat.java b/src/com/massivecraft/factions/cmd/CmdChat.java
index 801dedcf..645fb26e 100644
--- a/src/com/massivecraft/factions/cmd/CmdChat.java
+++ b/src/com/massivecraft/factions/cmd/CmdChat.java
@@ -30,7 +30,7 @@ public class CmdChat extends FCommand
 	{
 		if ( ! Conf.factionOnlyChat )
 		{
-			msg("<b>Faction-only chat is disabled on this server.");
+			msg("<b>The built in chat chat channels are disabled on this server.");
 			return;
 		}