diff --git a/scripts/npc/2013001.js b/scripts/npc/2013001.js
index 98a2c4dfaec..cdb394ae5f3 100644
--- a/scripts/npc/2013001.js
+++ b/scripts/npc/2013001.js
@@ -43,19 +43,28 @@ function action(mode, type, selection) {
         }
 
         if (cm.getPlayer().getMapId() == 920011200) { //exit
-            cm.warp(200080101);
-            cm.dispose();
+            if (status == 0) {
+                cm.sendNext("I will now send you to #m200080101#.");
+            }
+            else {
+                cm.warp(200080101);
+                cm.dispose();
+            }
             return;
         }
         if (!cm.isEventLeader()) {
             if (cm.getPlayer().getMapId() == 920010000) {
                 cm.warp(920010000, 2);
                 cm.dispose();
-                return;
             }
-
-            cm.sendOk("I only wish to speak to your leader!");
-            cm.dispose();
+            else if (status > 0) {
+                cm.warp(cm.getPlayer().getMap().getReturnMapId());
+                cm.dispose();
+            }
+            else {
+                cm.sendYesNo("Are you sure you want to leave without your teammates?");
+            }
+            
             return;
         }
 
@@ -81,7 +90,7 @@ function action(mode, type, selection) {
                     } else if (eim.getIntProperty("statusStg8") == -1) {
                         cm.sendOk("Oh! You brought the #t4001055#! Please, drop it at the base of the statue to bring Minerva back!");
                     } else {
-                        cm.sendOk("Thank you for saving Minerva! Please, talk to her...");
+                        cm.sendOk("Thank you so much for rescuing goddess Minerva!");
                     }
                 } else {
                     cm.sendOk("Please, save Minerva! Gather the six pieces of her statue and then talk to me to retrieve the final piece!");
diff --git a/scripts/portal/party3_roomout.js b/scripts/portal/party3_roomout.js
index ce623533338..486cb8cc17b 100644
--- a/scripts/portal/party3_roomout.js
+++ b/scripts/portal/party3_roomout.js
@@ -1,37 +1,39 @@
 function enter(pi) {
-    var exitPortal = 0;
-
-    switch (pi.getMapId()) {
-        case 920010200:
-            exitPortal = 4;
-            break;
-
-        case 920010300:
-            exitPortal = 12;
-            break;
-
-        case 920010400:
-            exitPortal = 5;
-            break;
-
-        case 920010500:
-            exitPortal = 13;
-            break;
-
-        case 920010600:
-            exitPortal = 15;
-            break;
-
-        case 920010700:
-            exitPortal = 14;
-            break;
-
-        case 920011000:
-            exitPortal = 16;
-            break;
-    }
-
-    pi.playPortalSound();
-    pi.warp(920010100, exitPortal);
-    return true;
+        var exitPortal = 0;
+        
+        switch(pi.getMapId()) {
+            case 920010200:
+                exitPortal = 4;
+                break;
+
+            case 920010300:
+                exitPortal = 12;
+                break;
+
+            case 920010400:
+                exitPortal = 5;
+                break;
+
+            case 920010500:
+                var eim = pi.getPlayer().getEventInstance();
+                if (eim.isEventLeader(pi.getPlayer())) eim.setIntProperty("statusStg4", -1);
+                exitPortal = 13;
+                break;
+
+            case 920010600:
+                exitPortal = 15;
+                break;
+
+            case 920010700:
+                exitPortal = 14;
+                break;
+                
+            case 920011000:
+                exitPortal = 16;
+                break;
+        }
+
+        pi.playPortalSound();
+        pi.warp(920010100, exitPortal);
+        return true;
 }
\ No newline at end of file