diff --git a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties
index b5e1c15f..eb7e9b1d 100644
--- a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties
+++ b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties
@@ -82,7 +82,8 @@ UTIL_LOAD_ERROR=§cThe schematic could not be loaded
 UTIL_DOWNLOAD_PUNISHED=§cYou are not allowed to download schematics: §f§l{0}
 UTIL_DOWNLOAD_NOT_OWN=§cYou may download only your own schematics
 UTIL_DOWNLOAD_LINK=Your download link:
-UTIL_TYPE_PUNISHED=§cYou are not allowed to submit schematics: §f§l{0}
+UTIL_TYPE_PUNISHED=§cYou are not allowed to submit schematics until §e{0}§7: §f§l{1}
+UTIL_TYPE_PUNISHED_PERMA=§cYou are permanently prohibited from submitting schematics: §f§l{0}
 UTIL_TYPE_NOT_OWN=§cYou can only submit your own schematics
 UTIL_TYPE_DIR=§cYou cannot submit folders
 UTIL_TYPE_NOT_ASSIGNABLE=§cSchematics cannot be changed for this type
diff --git a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties
index cf370bcb..f52763a9 100644
--- a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties
+++ b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties
@@ -69,7 +69,8 @@ UTIL_LOAD_ERROR=§cDie Schematic konnte nicht geladen werden
 UTIL_DOWNLOAD_PUNISHED=§cDu darf keine Schematics Downloaden: §f§l{0}
 UTIL_DOWNLOAD_NOT_OWN=§cDu darfst nur deine eigenen Schematics herunterladen
 UTIL_DOWNLOAD_LINK=Dein Download Link:
-UTIL_TYPE_PUNISHED=§cDu darf keine Schematics einsenden: §f§l{0}
+UTIL_TYPE_PUNISHED=§cDu darfst bis zum §e{0} §7keine Schematics einsenden: §f§l{1}
+UTIL_TYPE_PUNISHED_PERMA=§cDu darfst keine Schematics mehr einsenden: §f§l{0}
 UTIL_TYPE_NOT_OWN=§cDu kannst nur deine eigenen Schematics einsenden
 UTIL_TYPE_DIR=§cDu kannst keine Ordner einsenden
 UTIL_TYPE_NOT_ASSIGNABLE=§cZu diesem Typen können keine Schematics geändert werden
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
index 753cd3b9..ba48a78f 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
@@ -401,11 +401,6 @@ public class SchematicCommandUtils {
 
     public static void changeType(Player player, SchematicNode node, SchematicType type, SchematicCommand.Extend extend) {
         SteamwarUser user = getUser(player);
-        if (Punishment.isPunished(user,
-                Punishment.PunishmentType.NoSchemSubmitting,
-                punishment -> SchematicSystem.MESSAGE.send("UTIL_TYPE_PUNISHED", player, punishment.getReason()))) {
-            return;
-        }
         if (node.getOwner() != user.getId()) {
             SchematicSystem.MESSAGE.send("UTIL_TYPE_NOT_OWN", player);
             return;
@@ -430,6 +425,18 @@ public class SchematicCommandUtils {
             node.setSchemtype(type);
             SchematicSystem.MESSAGE.send("UTIL_TYPE_DONE", player);
         } else if (type.fightType()) {
+            if (Punishment.isPunished(user,
+                    Punishment.PunishmentType.NoSchemSubmitting,
+                    punishment -> {
+                        if (punishment.isPerma()) {
+                            SchematicSystem.MESSAGE.send("UTIL_TYPE_PUNISHED_PERMA", player, punishment.getReason());
+                        } else {
+                            SchematicSystem.MESSAGE.send("UTIL_TYPE_PUNISHED", player, punishment.getEndTime(), punishment.getReason());
+                        }
+                    })) {
+                return;
+            }
+
             if (node.getSchemtype().check()) {
                 SchematicSystem.MESSAGE.send("UTIL_TYPE_FIGHT_ALREADY", player);
                 return;