diff --git a/src/main/java/org/parabot/randoms/Core.java b/src/main/java/org/parabot/randoms/Core.java
index 466f4b8..db290e5 100755
--- a/src/main/java/org/parabot/randoms/Core.java
+++ b/src/main/java/org/parabot/randoms/Core.java
@@ -3,6 +3,7 @@ package org.parabot.randoms;
 import org.parabot.core.Context;
 import org.parabot.environment.randoms.Random;
 import org.parabot.randoms.dreamscape.SerialBanAvoider;
+import org.parabot.randoms.elkoy.LogoutDisabler;
 import org.parabot.randoms.elkoy.QuestionSolver;
 import org.parabot.randoms.pkhonor.*;
 
@@ -27,7 +28,8 @@ public class Core {
         randoms.add(new SerialBanAvoider());
 
         //Elkoy
-        randoms.add(new QuestionSolver());
+        //randoms.add(new QuestionSolver());
+        randoms.add(new LogoutDisabler());
 
         org.parabot.core.Core.verbose("Possible randoms:");
         for (Random random : randoms) {
diff --git a/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java b/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java
new file mode 100644
index 0000000..8fb3681
--- /dev/null
+++ b/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java
@@ -0,0 +1,49 @@
+package org.parabot.randoms.elkoy;
+
+import org.parabot.environment.api.utils.Time;
+import org.parabot.environment.input.Keyboard;
+import org.parabot.environment.randoms.RandomType;
+import org.rev317.min.api.methods.Game;
+
+import java.awt.event.KeyEvent;
+import java.util.Random;
+
+/**
+ * @author EmmaStone
+ */
+public class LogoutDisabler implements org.parabot.environment.randoms.Random {
+
+    private final int[] KEYS = {KeyEvent.VK_UP, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT, KeyEvent.VK_RIGHT};
+    private final Random random = new Random();
+    private long ms = System.currentTimeMillis();
+
+    @Override
+    public boolean activate() {
+        return Game.isLoggedIn() && (System.currentTimeMillis() - ms) / 1000 > random.nextInt((50 - 30) + 1) + 30;
+    }
+
+    @Override
+    public void execute() {
+        int keyCode = KEYS[random.nextInt(KEYS.length)];
+        Keyboard.getInstance().pressKey(keyCode);
+        Time.sleep(random.nextInt((20 - 5) + 1) + 5);
+        Keyboard.getInstance().releaseKey(keyCode);
+
+        ms = System.currentTimeMillis();
+    }
+
+    @Override
+    public String getName() {
+        return "Logout Disabler";
+    }
+
+    @Override
+    public String getServer() {
+        return "Elkoy";
+    }
+
+    @Override
+    public RandomType getRandomType() {
+        return RandomType.SCRIPT;
+    }
+}
diff --git a/src/main/java/org/parabot/randoms/elkoy/QuestionSolver.java b/src/main/java/org/parabot/randoms/elkoy/QuestionSolver.java
index 5123558..21b8fd8 100644
--- a/src/main/java/org/parabot/randoms/elkoy/QuestionSolver.java
+++ b/src/main/java/org/parabot/randoms/elkoy/QuestionSolver.java
@@ -32,8 +32,8 @@ public class QuestionSolver implements Random {
 
     @Override
     public void execute() {
-        String message = Loader.getClient().getInterfaceCache()[372].getMessage();
-        if (!message.contains("lose items on death, beware")) {
+        String message = Loader.getClient().getInterfaceCache()[371].getMessage();
+        if (!message.contains("otherwise you will be teleported")) {
             message = message.replace("@dre@ ", "");
 
             Logger.addMessage("Contacting server to get an answer", false);