diff --git a/src/com/cnaude/chairs/commands/ChairsCommand.java b/src/com/cnaude/chairs/commands/ChairsCommand.java
index 638fd6c..847d872 100644
--- a/src/com/cnaude/chairs/commands/ChairsCommand.java
+++ b/src/com/cnaude/chairs/commands/ChairsCommand.java
@@ -41,10 +41,10 @@ public class ChairsCommand implements CommandExecutor {
 		if (sender instanceof Player) {
 			Player player = (Player) sender;
 			if (args[0].equalsIgnoreCase("off")) {
-				plugin.sitDisabled.add(player.getName());
+				plugin.sitDisabled.add(player.getUniqueId());
 				player.sendMessage(plugin.msgDisabled);
 			} else if (args[0].equalsIgnoreCase("on")) {
-				plugin.sitDisabled.remove(player.getName());
+				plugin.sitDisabled.remove(player.getUniqueId());
 				player.sendMessage(plugin.msgEnabled);
 			}
 		}
diff --git a/src/com/cnaude/chairs/core/Chairs.java b/src/com/cnaude/chairs/core/Chairs.java
index 8798d02..04f7129 100644
--- a/src/com/cnaude/chairs/core/Chairs.java
+++ b/src/com/cnaude/chairs/core/Chairs.java
@@ -1,9 +1,14 @@
 package com.cnaude.chairs.core;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -26,7 +31,7 @@ import com.cnaude.chairs.vehiclearrow.NMSAccess;
 
 public class Chairs extends JavaPlugin {
 
-	public HashSet<String> sitDisabled = new HashSet<String>();
+	public HashSet<UUID> sitDisabled = new HashSet<UUID>();
 	public ChairEffects chairEffects;
 	public List<ChairBlock> allowedBlocks;
 	public List<Material> validSigns;
@@ -100,6 +105,7 @@ public class Chairs extends JavaPlugin {
 		log = null;
 		nmsaccess = null;
 		psitdata = null;
+		saveSitDisabled();
 	}
 
 	public void loadConfig() {
@@ -157,6 +163,40 @@ public class Chairs extends JavaPlugin {
 				logError(e.getMessage());
 			}
 		}
+
+		try {
+			File sitDisabledFile = new File(getDataFolder(), "sit-disabled.txt");
+			if (sitDisabledFile.exists()) {
+				String line = null;
+				sitDisabled.clear();
+				BufferedReader br = new BufferedReader(new FileReader(sitDisabledFile));
+				while ((line = br.readLine()) != null) {
+					try {
+						sitDisabled.add(UUID.fromString(line));
+					} catch (IllegalArgumentException e) {
+						/* Not a UUID */
+					}
+				}
+				br.close();
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void saveSitDisabled() {
+		try {
+			File sitDisabledFile = new File(getDataFolder(), "sit-disabled.txt");
+			if (!sitDisabledFile.exists())
+				sitDisabledFile.createNewFile();
+			PrintWriter writer = new PrintWriter(sitDisabledFile, "UTF-8");
+			writer.println("# The following players disabled Chairs for themselves");
+			for (UUID uuid : sitDisabled)
+				writer.println(uuid.toString());
+			writer.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
 	}
 
 	public void logInfo(String _message) {
diff --git a/src/com/cnaude/chairs/listeners/TrySitEventListener.java b/src/com/cnaude/chairs/listeners/TrySitEventListener.java
index 7b801a7..1505ed0 100644
--- a/src/com/cnaude/chairs/listeners/TrySitEventListener.java
+++ b/src/com/cnaude/chairs/listeners/TrySitEventListener.java
@@ -44,7 +44,7 @@ public class TrySitEventListener implements Listener {
 	private boolean sitAllowed(Player player, Block block) {
 
 		// Check for sitting disabled
-		if (plugin.sitDisabled.contains(player.getName())) {
+		if (plugin.sitDisabled.contains(player.getUniqueId())) {
 			return false;
 		}