diff --git a/pom.xml b/pom.xml
index 43bedc8..203c2b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.dre</groupId>
-	<artifactId>Brewery</artifactId>
+	<artifactId>BreweryX</artifactId>
 	<version>3.1.7</version>
-	<name>Brewery</name>
+	<name>BreweryX</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/resources/config/v12/de/config.yml b/resources/config/v12/de/config.yml
index 4213a0d..7292495 100644
--- a/resources/config/v12/de/config.yml
+++ b/resources/config/v12/de/config.yml
@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Ob das reifen in -Minecraft- Fässern aktiviert ist und wie viele Brewery Getränke in die diese getan werden können [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/config/v12/en/config.yml b/resources/config/v12/en/config.yml
index e2f5a08..80f1f4d 100644
--- a/resources/config/v12/en/config.yml
+++ b/resources/config/v12/en/config.yml
@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/config/v12/fr/config.yml b/resources/config/v12/fr/config.yml
index 990f42a..94fcb84 100644
--- a/resources/config/v12/fr/config.yml
+++ b/resources/config/v12/fr/config.yml
@@ -69,6 +69,9 @@ alwaysShowQuality: true
 # Toujours indiquer la teneur en alcool sur les objets. S'il est false, il n'apparaîtra que dans le stand de brassage. [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Combien de boissons de brasserie peuvent être mises dans les barils -Minecraft- [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/config/v12/it/config.yml b/resources/config/v12/it/config.yml
index e567a39..594f19e 100644
--- a/resources/config/v12/it/config.yml
+++ b/resources/config/v12/it/config.yml
@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml
index 2d55d11..2a89d52 100644
--- a/resources/config/v13/de/config.yml
+++ b/resources/config/v13/de/config.yml
@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Ob das reifen in -Minecraft- Fässern aktiviert ist und wie viele Brewery Getränke in die diese getan werden können [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/config/v13/en/config.yml b/resources/config/v13/en/config.yml
index a9b2868..5c2c3b5 100644
--- a/resources/config/v13/en/config.yml
+++ b/resources/config/v13/en/config.yml
@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/config/v13/es/config.yml b/resources/config/v13/es/config.yml
index 40d68a0..a7abc05 100644
--- a/resources/config/v13/es/config.yml
+++ b/resources/config/v13/es/config.yml
@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/config/v13/fr/config.yml b/resources/config/v13/fr/config.yml
index 2a90577..dd356c5 100644
--- a/resources/config/v13/fr/config.yml
+++ b/resources/config/v13/fr/config.yml
@@ -69,6 +69,9 @@ alwaysShowQuality: true
 # Toujours indiquer la teneur en alcool sur les objets. S'il est false, il n'apparaîtra que dans le stand de brassage. [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Combien de boissons de brasserie peuvent être mises dans les barils -Minecraft- [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/config/v13/it/config.yml b/resources/config/v13/it/config.yml
index f159215..cfbdd37 100644
--- a/resources/config/v13/it/config.yml
+++ b/resources/config/v13/it/config.yml
@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/config/v13/zh/config.yml b/resources/config/v13/zh/config.yml
index fdc148a..15ae019 100644
--- a/resources/config/v13/zh/config.yml
+++ b/resources/config/v13/zh/config.yml
@@ -70,6 +70,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # MC自带的桶内可以存放多少饮品 [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
diff --git a/resources/languages/de.yml b/resources/languages/de.yml
index de6fa9f..eedfac0 100644
--- a/resources/languages/de.yml
+++ b/resources/languages/de.yml
@@ -16,6 +16,7 @@ Brew_Years: Jahre
 Brew_fermented: gegärt
 Brew_minute: minute
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cTränke haben nicht mehr in das Inventar gepasst'
diff --git a/resources/languages/en.yml b/resources/languages/en.yml
index 390da49..cf162e1 100644
--- a/resources/languages/en.yml
+++ b/resources/languages/en.yml
@@ -16,6 +16,7 @@ Brew_Years: Years
 Brew_fermented: fermented
 Brew_minute: minute
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cPotions did not fit into your inventory'
diff --git a/resources/languages/es.yml b/resources/languages/es.yml
index 3af88c9..3d1e720 100644
--- a/resources/languages/es.yml
+++ b/resources/languages/es.yml
@@ -17,6 +17,7 @@ Brew_Years: Años
 Brew_fermented: fermentado
 Brew_minute: minuto
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cLas pociones no cabían en tu inventario'
diff --git a/resources/languages/fr.yml b/resources/languages/fr.yml
index 5f2c792..e5ff5e1 100644
--- a/resources/languages/fr.yml
+++ b/resources/languages/fr.yml
@@ -16,6 +16,7 @@ Brew_Years: Années
 Brew_fermented: fermenté
 Brew_minute: minute
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cCes potions ne rentrent pas dans votre inventaire.'
diff --git a/resources/languages/it.yml b/resources/languages/it.yml
index f29e9fe..dae6b5f 100755
--- a/resources/languages/it.yml
+++ b/resources/languages/it.yml
@@ -16,6 +16,7 @@ Brew_Years: Anni
 Brew_fermented: fermentata
 Brew_minute: minuto
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # Comandi
 CMD_Copy_Error: '&6&v1 &cLe copie di questa pozione non stavano nell''inventario.'
diff --git a/resources/languages/ru.yml b/resources/languages/ru.yml
index f08556a..4404450 100644
--- a/resources/languages/ru.yml
+++ b/resources/languages/ru.yml
@@ -16,6 +16,7 @@ Brew_Years: года
 Brew_fermented: ферментировано
 Brew_minute: минут
 Brew_Alc: Алк &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cЗелья не поместились в инвентарь'
diff --git a/resources/languages/tw.yml b/resources/languages/tw.yml
index 9872197..2bd20b2 100644
--- a/resources/languages/tw.yml
+++ b/resources/languages/tw.yml
@@ -16,6 +16,7 @@ Brew_Years: 年
 Brew_fermented: 發酵
 Brew_minute: 分鐘
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &c藥水不適合你的庫存'
diff --git a/resources/languages/zh.yml b/resources/languages/zh.yml
index fa786f2..c9d8d49 100644
--- a/resources/languages/zh.yml
+++ b/resources/languages/zh.yml
@@ -16,6 +16,7 @@ Brew_Years: 年
 Brew_fermented: 炖煮发酵
 Brew_minute: 分钟
 Brew_Alc: 酒精度 &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1&r, &c你的背包塞不下了.'
diff --git a/resources/plugin.yml b/resources/plugin.yml
index 32301f9..49aec97 100644
--- a/resources/plugin.yml
+++ b/resources/plugin.yml
@@ -1,4 +1,4 @@
-name: Brewery
+name: BreweryX
 version: '${project.version}'
 website: 'https://www.spigotmc.org/resources/breweryx.114777/'
 main: com.dre.brewery.BreweryPlugin
diff --git a/src/com/dre/brewery/BCauldron.java b/src/com/dre/brewery/BCauldron.java
index 54c36b2..a31cd97 100644
--- a/src/com/dre/brewery/BCauldron.java
+++ b/src/com/dre/brewery/BCauldron.java
@@ -168,7 +168,7 @@ public class BCauldron {
 			BreweryPlugin.getInstance().msg(player, BreweryPlugin.getInstance().languageReader.get("Perms_NoCauldronFill"));
 			return true;
 		}
-		ItemStack potion = ingredients.cook(state);
+		ItemStack potion = ingredients.cook(state, player.getName());
 		if (potion == null) return false;
 
 		if (BreweryPlugin.use1_13) {
diff --git a/src/com/dre/brewery/BIngredients.java b/src/com/dre/brewery/BIngredients.java
index 20f6825..1eb7b73 100644
--- a/src/com/dre/brewery/BIngredients.java
+++ b/src/com/dre/brewery/BIngredients.java
@@ -101,7 +101,7 @@ public class BIngredients {
 	/**
 	 * returns an Potion item with cooked ingredients
 	 */
-	public ItemStack cook(int state) {
+	public ItemStack cook(int state, String brewer) {
 
 		ItemStack potion = new ItemStack(Material.POTION);
 		PotionMeta potionMeta = (PotionMeta) potion.getItemMeta();
@@ -125,6 +125,7 @@ public class BIngredients {
 			lore.updateQualityStars(false);
 			lore.updateCustomLore();
 			lore.updateAlc(false);
+			lore.updateBrewer(brewer);
 			lore.addOrReplaceEffects(brew.getEffects(), brew.getQuality());
 			lore.write();
 
diff --git a/src/com/dre/brewery/BPlayer.java b/src/com/dre/brewery/BPlayer.java
index de880b9..81c29bf 100644
--- a/src/com/dre/brewery/BPlayer.java
+++ b/src/com/dre/brewery/BPlayer.java
@@ -435,6 +435,10 @@ public class BPlayer {
 
 	// #### Login ####
 
+	public boolean canJoinSimpleStatus() {
+        return canJoin() == 0;
+    }
+
 	// can the player login or is he too drunk
 	public int canJoin() {
 		if (drunkeness <= 70) {
@@ -906,4 +910,17 @@ public class BPlayer {
 	public void setAlcRecovery(int alcRecovery) {
 		this.alcRecovery = alcRecovery;
 	}
+
+
+	public String getName() {
+		Player player = BUtil.getPlayerfromString(uuid);
+		OfflinePlayer offlinePlayer;
+
+		if (player != null) {
+			return player.getName();
+		} else {
+			offlinePlayer = Bukkit.getOfflinePlayer(UUID.fromString(uuid));
+		}
+		return offlinePlayer.getName();
+	}
 }
diff --git a/src/com/dre/brewery/filedata/BConfig.java b/src/com/dre/brewery/filedata/BConfig.java
index fce5347..cdad45c 100644
--- a/src/com/dre/brewery/filedata/BConfig.java
+++ b/src/com/dre/brewery/filedata/BConfig.java
@@ -88,6 +88,7 @@ public class BConfig {
 	public static boolean enableEncode;
 	public static boolean alwaysShowQuality; // Always show quality stars
 	public static boolean alwaysShowAlc; // Always show alc%
+	public static boolean showBrewer;
 	public static boolean brewHopperDump; // Allow Dumping of Brew liquid into Hoppers
 
 	//Features
@@ -239,6 +240,7 @@ public class BConfig {
 		colorInBrewer = config.getBoolean("colorInBrewer", false);
 		alwaysShowQuality = config.getBoolean("alwaysShowQuality", false);
 		alwaysShowAlc = config.getBoolean("alwaysShowAlc", false);
+		showBrewer = config.getBoolean("showBrewer", false);
 		enableEncode = config.getBoolean("enableEncode", false);
 		openEverywhere = config.getBoolean("openLargeBarrelEverywhere", false);
 		enableCauldronParticles = BreweryPlugin.use1_9 && config.getBoolean("enableCauldronParticles", false);
diff --git a/src/com/dre/brewery/lore/BrewLore.java b/src/com/dre/brewery/lore/BrewLore.java
index 86788c8..8e003fb 100644
--- a/src/com/dre/brewery/lore/BrewLore.java
+++ b/src/com/dre/brewery/lore/BrewLore.java
@@ -291,6 +291,14 @@ public class BrewLore {
 		}
 	}
 
+	public void updateBrewer(String name) {
+		if (name != null && BConfig.showBrewer) {
+			addOrReplaceLore(Type.BREWER, "§8", BreweryPlugin.getInstance().languageReader.get("Brew_Brewer", name));
+		} else {
+			removeLore(Type.BREWER);
+		}
+	}
+
 	/**
 	 * Converts to/from qualitycolored Lore
  	 */
@@ -577,7 +585,8 @@ public class BrewLore {
 		DISTILL("§p"),
 		AGE("§y"),
 		WOOD("§z"),
-		ALC("§q");
+		ALC("§q"),
+		BREWER("§g");
 
 		public final String id;