diff --git a/src/intents/ServerManagementIntent.java b/src/intents/ServerManagementIntent.java
index 10607e90..4ffe5e7f 100644
--- a/src/intents/ServerManagementIntent.java
+++ b/src/intents/ServerManagementIntent.java
@@ -9,6 +9,7 @@ public class ServerManagementIntent extends Intent {
 	private Player player;
 	private String target;
 	private ServerManagementEvent event;
+	private long time;
 	
 	public ServerManagementIntent(Player p, String target, ServerManagementEvent event) {
 		super(TYPE);
@@ -16,7 +17,13 @@ public class ServerManagementIntent extends Intent {
 		this.target = target;
 		this.event = event;
 	}
-
+	
+	public ServerManagementIntent(long time, ServerManagementEvent event) {
+		this(null, null, event);
+		this.time = time;
+	}
+	
+	public long getTime() { return time; }
 	public Player getPlayer() { return player; }
 	public String getTarget() { return target; }
 	public ServerManagementEvent getEvent() { return event; }
diff --git a/src/resources/commands/callbacks/ServerCmdCallback.java b/src/resources/commands/callbacks/ServerCmdCallback.java
index 0ea5f517..a12a5df3 100644
--- a/src/resources/commands/callbacks/ServerCmdCallback.java
+++ b/src/resources/commands/callbacks/ServerCmdCallback.java
@@ -94,7 +94,7 @@ public class ServerCmdCallback implements ICmdCallback {
 
 				@Override
 				public void handleEvent(Player player, SWGObject actor, int eventType, List<String> returnParams) {
-					new ServerManagementIntent(player, null, ServerManagementEvent.SHUTDOWN).broadcast();
+					new ServerManagementIntent(15, ServerManagementEvent.SHUTDOWN).broadcast();
 				}
 			});
 			
diff --git a/src/resources/sui/SuiMessageBox.java b/src/resources/sui/SuiMessageBox.java
index ce4eaa50..47505a7e 100644
--- a/src/resources/sui/SuiMessageBox.java
+++ b/src/resources/sui/SuiMessageBox.java
@@ -9,6 +9,8 @@ public class SuiMessageBox extends SuiBaseWindow {
 
 	public SuiMessageBox(Player owner, MessageBoxType type, String title, String prompt) {
 		super("Script.messageBox", owner, title, prompt);
+		
+		setProperty("btnRevert:visible", "False");
 		switch(type) {
 		case OK:
 			setProperty("btnOk:visible", "True");
diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java
index 7ea484bf..50f0327f 100644
--- a/src/services/CoreManager.java
+++ b/src/services/CoreManager.java
@@ -100,7 +100,7 @@ public class CoreManager extends Manager {
 	
 	private void handleServerManagementIntent(ServerManagementIntent i) {
 		switch(i.getEvent()) {
-		case SHUTDOWN: initiateShutdownSequence(15);  break;
+		case SHUTDOWN: initiateShutdownSequence(i.getTime());  break;
 		default: break;
 		}
 		
diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java
index fa2ea37c..0f031030 100644
--- a/src/services/chat/ChatService.java
+++ b/src/services/chat/ChatService.java
@@ -259,11 +259,11 @@ public class ChatService extends Service {
 					broadcastGalaxyMessage(String.format("The server will be shutting down in %d minutes.", time - (interval*2)), null);
 					break;
 				case 3:
-					broadcastGalaxyMessage("The server will be shutting down in 1 minute.", null);
+					broadcastGalaxyMessage("The server will now be shutting down.", null);
 					throw new RuntimeException("Reached max runCount"); // no "clean" ways to cancel the runnable I can think of
 				}
 			}
-		}, 0, time, TimeUnit.MINUTES);
+		}, 0, interval, TimeUnit.MINUTES);
 		
 	}