diff --git a/docs/upgrades/packages-7.6.4/default_ldap_account_display_template.wgpkg b/docs/upgrades/packages-7.6.4/default_ldap_account_display_template.wgpkg
index acbf1f07a..7c649dbb6 100644
Binary files a/docs/upgrades/packages-7.6.4/default_ldap_account_display_template.wgpkg and b/docs/upgrades/packages-7.6.4/default_ldap_account_display_template.wgpkg differ
diff --git a/docs/upgrades/packages-7.6.4/default_webgui_account_display_template.wgpkg b/docs/upgrades/packages-7.6.4/default_webgui_account_display_template.wgpkg
index 6ab653d53..cea33fea3 100644
Binary files a/docs/upgrades/packages-7.6.4/default_webgui_account_display_template.wgpkg and b/docs/upgrades/packages-7.6.4/default_webgui_account_display_template.wgpkg differ
diff --git a/docs/upgrades/packages-7.6.4/root_import_macro.wgpkg b/docs/upgrades/packages-7.6.4/root_import_macro.wgpkg
deleted file mode 100644
index 0b55abae4..000000000
Binary files a/docs/upgrades/packages-7.6.4/root_import_macro.wgpkg and /dev/null differ
diff --git a/docs/upgrades/upgrade_7.6.3-7.6.4.pl b/docs/upgrades/upgrade_7.6.3-7.6.4.pl
index ac002de03..b1d85dcfe 100644
--- a/docs/upgrades/upgrade_7.6.3-7.6.4.pl
+++ b/docs/upgrades/upgrade_7.6.3-7.6.4.pl
@@ -31,8 +31,8 @@ my $quiet; # this line required
 
 my $session = start(); # this line required
 
-migrateSurvey($session);
 addVersionTagMode($session);
+migrateSurvey($session);
 addPosMode($session);
 fixFriendsGroups( $session );
 upgradeAccount( $session );
@@ -386,7 +386,7 @@ sub upgradeAccount {
 
     #Add new macros to the config file
     $session->config->addToHash("macros","BackToSite","BackToSite");
-    $session->config->addToHash("macros","HasValueText","HasValueText");
+    $session->config->addToHash("macros","If","If");
     $session->config->addToHash("macros","DeactivateAccount","DeactivateAccount");
 
     
diff --git a/lib/WebGUI/Macro/DeactivateAccount.pm b/lib/WebGUI/Macro/DeactivateAccount.pm
index 0f616ad6f..178e9d402 100644
--- a/lib/WebGUI/Macro/DeactivateAccount.pm
+++ b/lib/WebGUI/Macro/DeactivateAccount.pm
@@ -23,7 +23,7 @@ Package WebGUI::Macro::DeactivateAccount
 Macro for displaying a url to the user for deactivating their account, if
 the setting is turned on.
 
-=head2 process ( [deactivateText, template ] )
+=head2 process ( deactivateText )
 
 process takes two optional parameters for customizing the content and layout
 of the self deactivation link.
@@ -32,7 +32,7 @@ of the self deactivation link.
 
 The text displayed to the user for this link.  If this is blank an internationalized default is used.
 
-=head3 template
+=head3 linkonly
 
 The url for a template from the Macro/DeactivateAccount namespace to use for formatting the link.
 
@@ -41,20 +41,19 @@ The url for a template from the Macro/DeactivateAccount namespace to use for for
 #-------------------------------------------------------------------
 sub process {
     my $session = shift;
-    my ($deactivateText, $templateName) = @_;
+    my ($deactivateText, $linkonly) = @_;
 
     return "" unless ($session->setting->get("selfDeactivation") && !$session->user->isAdmin);
 
-    my $i18n = WebGUI::International->new($session);
-    my $var  = {};    
-        
-    $var->{'self_deactivation_url' } = $session->url->page('op=auth;method=deactivateAccount');
-    $var->{'self_deactivation_text'} = $deactivateText || $i18n->get(65);    
+    my $deactivateUrl = $session->url->page('op=auth;method=deactivateAccount');
 
-    my $template = $templateName    ? WebGUI::Asset::Template->newByUrl($session, $templateName)
-                                    : WebGUI::Asset::Template->new($session, "CocyDcs-NqmKtPy0Bs_vUA")
-                                    ;
-    return $template->process($var);
+    return $deactivateUrl if($linkonly);
+
+    my $i18n           = WebGUI::International->new($session);
+    my $format         = q{<a href="%s">%s</a>};
+    $deactivateText    = $i18n->get(65) unless ($deactivateText);
+    
+    return sprintf($format,$deactivateUrl,$deactivateText);
 }
 
 1;
diff --git a/lib/WebGUI/Macro/HasValueText.pm b/lib/WebGUI/Macro/If.pm
similarity index 95%
rename from lib/WebGUI/Macro/HasValueText.pm
rename to lib/WebGUI/Macro/If.pm
index 80a4ecf73..312161ef9 100644
--- a/lib/WebGUI/Macro/HasValueText.pm
+++ b/lib/WebGUI/Macro/If.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::HasValueText;
+package WebGUI::Macro::If;
 
 #-------------------------------------------------------------------
 # WebGUI is Copyright 2001-2008 Plain Black Corporation.
@@ -14,7 +14,7 @@ use strict;
 
 =head1 NAME
 
-Package WebGUI::Macro::HasValueText
+Package WebGUI::Macro::If
 
 =head1 DESCRIPTION