diff --git a/tools/arkmanager b/tools/arkmanager
index 01d60fb..de36fc9 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -1542,7 +1542,6 @@ while true; do
     ;;
     stop)
         if [ " ${options[*]} " =~ " --all " ]; then
-        if [ "$2" == "--all" ]; then
           doStopAll
           shift
         else
@@ -1551,7 +1550,6 @@ while true; do
     ;;
     restart)
         if [ " ${options[*]} " =~ " --all " ]; then
-        if [ "$2" == "--all" ]; then
 	  doStopAll
 	else
           doStop restart "${options[@]}"
@@ -1559,7 +1557,6 @@ while true; do
         echo "`timestamp`: stop" >> "$logdir/$arkmanagerLog"
         sleep 1
         if [ " ${options[*]} " =~ " --all " ]; then
-	if [ "$2" == "--all" ]; then
           doStartAll
 	  shift
 	else
diff --git a/tools/arkmanager.cfg b/tools/arkmanager.cfg
index 51e6237..96c8c05 100644
--- a/tools/arkmanager.cfg
+++ b/tools/arkmanager.cfg
@@ -24,6 +24,10 @@ arkTimeToKeepBackupFiles="10"                                       #Set to Auto
 # Modify as desired, putting the %d replacement operator where the number belongs
 msgWarnUpdateMinutes="This ARK server will shutdown for an update in %d minutes"
 msgWarnUpdateSeconds="This ARK server will shutdown for an update in %d seconds"
+msgWarnRestartMinutes="This ARK server will shutdown for a restart in %d minutes"
+msgWarnRestartSeconds="This ARK server will shutdown for a restart in %d seconds"
+msgWarnShutdownMinutes="This ARK server will shutdown in %d minutes"
+msgWarnShutdownSeconds="This ARK server will shutdown in %d seconds"
 
 # ARK server options - use ark_<optionname>=<value>
 # comment out these values if you want to define them