diff --git a/build.gradle b/build.gradle
index 70110738d..45b195905 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'idea'
 apply plugin: 'maven-publish'
 
-version = '1.3.0'
+version = '1.3.1'
 group = 'com.rettichlp' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'UnicacityAddon'
 
diff --git a/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java b/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java
index 234a61488..110bd98a2 100644
--- a/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java
+++ b/src/main/java/com/rettichlp/UnicacityAddon/UnicacityAddon.java
@@ -36,7 +36,7 @@
 @Mod(name = "UnicacityAddon", modid = "unicacityaddon", version = UnicacityAddon.VERSION, clientSideOnly = true, acceptedMinecraftVersions = "[1.12,1.12.2]")
 public class UnicacityAddon extends LabyModAddon {
 
-    public static final String VERSION = "1.3.0";
+    public static final String VERSION = "1.3.1";
     public static final Minecraft MINECRAFT = Minecraft.getMinecraft();
     public static UnicacityAddon ADDON;
 
diff --git a/src/main/java/com/rettichlp/UnicacityAddon/events/CheckKFZEventHandler.java b/src/main/java/com/rettichlp/UnicacityAddon/events/CheckKFZEventHandler.java
index 2a6e0ac1e..32b66e66d 100644
--- a/src/main/java/com/rettichlp/UnicacityAddon/events/CheckKFZEventHandler.java
+++ b/src/main/java/com/rettichlp/UnicacityAddon/events/CheckKFZEventHandler.java
@@ -1,6 +1,7 @@
 package com.rettichlp.UnicacityAddon.events;
 
 import com.rettichlp.UnicacityAddon.base.abstraction.AbstractionLayer;
+import com.rettichlp.UnicacityAddon.base.registry.annotation.UCEvent;
 import com.rettichlp.UnicacityAddon.base.text.PatternHandler;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -11,6 +12,7 @@
  * @author Fuzzlemann
  * @see <a href="https://github.com/paulzhng/UCUtils/blob/master/src/main/java/de/fuzzlemann/ucutils/events/CheckKFZEventHandler.java">UCUtils by paulzhng</a>
  */
+@UCEvent
 public class CheckKFZEventHandler {
 
     @SubscribeEvent
diff --git a/src/main/java/com/rettichlp/UnicacityAddon/events/JoinEventHandler.java b/src/main/java/com/rettichlp/UnicacityAddon/events/JoinEventHandler.java
index 7ec6f6480..ac6614b6d 100644
--- a/src/main/java/com/rettichlp/UnicacityAddon/events/JoinEventHandler.java
+++ b/src/main/java/com/rettichlp/UnicacityAddon/events/JoinEventHandler.java
@@ -28,6 +28,7 @@ public boolean onClientChatReceived(ClientChatReceivedEvent e) {
 
         if (PatternHandler.ACCOUNT_WELCOME_BACK_PATTERN.matcher(msg).find()) {
             MobileEventHandler.activeCommunicationsCheck = true;
+            PayDayEventHandler.isAfk = false;
             handleJoin();
             return false;
         }
@@ -63,31 +64,31 @@ public void run() {
                 p.sendChatMessage("/mobile");
 
                 // AUTOMATE_COMMAND_SETTINGS
-                if (!ConfigElements.getCommandAutomation()) return;
-
-                // AUTOMATE_COMMAND_FIRST_SETTINGS
-                new Timer().schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        if (!ConfigElements.getFirstCommand().isEmpty()) p.sendChatMessage(ConfigElements.getFirstCommand());
-                    }
-                }, 500);
-
-                // AUTOMATE_COMMAND_SECOND_SETTINGS
-                new Timer().schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        if (!ConfigElements.getSecondCommand().isEmpty()) p.sendChatMessage(ConfigElements.getSecondCommand());
-                    }
-                }, 1000);
-
-                // AUTOMATE_COMMAND_THIRD_SETTINGS
-                new Timer().schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        if (!ConfigElements.getThirdCommand().isEmpty()) p.sendChatMessage(ConfigElements.getThirdCommand());
-                    }
-                }, 1500);
+                if (ConfigElements.getCommandAutomation()) {
+                    // AUTOMATE_COMMAND_FIRST_SETTINGS
+                    new Timer().schedule(new TimerTask() {
+                        @Override
+                        public void run() {
+                            if (!ConfigElements.getFirstCommand().isEmpty()) p.sendChatMessage(ConfigElements.getFirstCommand());
+                        }
+                    }, 500);
+
+                    // AUTOMATE_COMMAND_SECOND_SETTINGS
+                    new Timer().schedule(new TimerTask() {
+                        @Override
+                        public void run() {
+                            if (!ConfigElements.getSecondCommand().isEmpty()) p.sendChatMessage(ConfigElements.getSecondCommand());
+                        }
+                    }, 1000);
+
+                    // AUTOMATE_COMMAND_THIRD_SETTINGS
+                    new Timer().schedule(new TimerTask() {
+                        @Override
+                        public void run() {
+                            if (!ConfigElements.getThirdCommand().isEmpty()) p.sendChatMessage(ConfigElements.getThirdCommand());
+                        }
+                    }, 1500);
+                }
 
                 // UPDATECHECKER
                 new Timer().schedule(new TimerTask() {
diff --git a/src/main/java/com/rettichlp/UnicacityAddon/events/ReviveEventHandler.java b/src/main/java/com/rettichlp/UnicacityAddon/events/ReviveEventHandler.java
index 305ab1895..a4257e8a2 100644
--- a/src/main/java/com/rettichlp/UnicacityAddon/events/ReviveEventHandler.java
+++ b/src/main/java/com/rettichlp/UnicacityAddon/events/ReviveEventHandler.java
@@ -1,6 +1,7 @@
 package com.rettichlp.UnicacityAddon.events;
 
 import com.rettichlp.UnicacityAddon.base.abstraction.AbstractionLayer;
+import com.rettichlp.UnicacityAddon.base.registry.annotation.UCEvent;
 import com.rettichlp.UnicacityAddon.base.text.PatternHandler;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -8,6 +9,7 @@
 /**
  * @author Dimiikou
  */
+@UCEvent
 public class ReviveEventHandler {
 
     @SubscribeEvent