diff --git a/docs/upgrades/upgrade_3.8.0-3.9.0.sql b/docs/upgrades/upgrade_3.8.0-3.9.0.sql
index add8d26f0..a51ec74ca 100644
--- a/docs/upgrades/upgrade_3.8.0-3.9.0.sql
+++ b/docs/upgrades/upgrade_3.8.0-3.9.0.sql
@@ -94,6 +94,8 @@ alter table discussion add column views int not null default 0;
 INSERT INTO international VALUES (514,'WebGUI','English','Views');
 INSERT INTO international VALUES (515,'WebGUI','English','Add edit stamp to posts?');
 alter table UserSubmission_submission add column views int not null default 0
+INSERT INTO international VALUES (517,'WebGUI','English','Turn Admin Off!');
+INSERT INTO international VALUES (516,'WebGUI','English','Turn Admin On!');
 
 
 
diff --git a/lib/WebGUI/Macro/AdminToggle.pm b/lib/WebGUI/Macro/AdminToggle.pm
new file mode 100644
index 000000000..51ed12cda
--- /dev/null
+++ b/lib/WebGUI/Macro/AdminToggle.pm
@@ -0,0 +1,41 @@
+package WebGUI::Macro::AdminToggle;
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2002 Plain Black Software.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use strict;
+use WebGUI::International;
+use WebGUI::Session;
+use WebGUI::URL;
+
+#-------------------------------------------------------------------
+sub _replacement {
+	my ($temp);
+	if (WebGUI::Privilege::isInGroup(4)) {
+		if ($session{var}{adminOn}) {
+			$temp = '<a href="'.WebGUI::URL::page('op=switchOffAdmin').'">'.WebGUI::International::get(517).'</a>';
+		} else {
+			$temp = '<a href="'.WebGUI::URL::page('op=switchOnAdmin').'">'.WebGUI::International::get(516).'</a>';
+		}
+	}
+	return $temp;
+}
+
+#-------------------------------------------------------------------
+sub process {
+	my ($output, $temp);
+	$output = $_[0];
+        $output =~ s/\^AdminToggle\;/_replacement()/ge;
+	return $output;
+}
+
+1;
+
+