diff --git a/lib/WebGUI/Macro/a_account.pm b/lib/WebGUI/Macro/a_account.pm
index 3f6821318..1f63d879f 100644
--- a/lib/WebGUI/Macro/a_account.pm
+++ b/lib/WebGUI/Macro/a_account.pm
@@ -44,8 +44,8 @@ sub process {
 	my  @param = @_;
 	return $session->url->page("op=auth;method=init") if ($param[0] eq "linkonly");
 	my $i18n = WebGUI::International->new($session,'Macro_a_account');
-	$var{'account.url'} = $session->url->page('op=auth;method=init');
-	$var{'account.text'} = $param[0] || $i18n->get(46);
+	$var{'account_url'} = $session->url->page('op=auth;method=init');
+	$var{'account_text'} = $param[0] || $i18n->get(46);
 	if ($param[1]) {
 		return  WebGUI::Asset::Template->newByUrl($session, $param[1])->process(\%var);
 	} else {
diff --git a/t/Macro/AdminToggle.t b/t/Macro/AdminToggle.t
index 35f39513f..e6efb6b24 100644
--- a/t/Macro/AdminToggle.t
+++ b/t/Macro/AdminToggle.t
@@ -102,7 +102,7 @@ sub addTemplate {
 		className => 'WebGUI::Asset::Template',
 		url => 'admintoggle-test',
 		namespace => 'Macro/AdminToggle',
-		template => "HREF=<tmpl_var toggle.url>\nLABEL=<tmpl_var toggle.text>",
+		template => "HREF=<tmpl_var toggle_url>\nLABEL=<tmpl_var toggle_text>",
 		id => 'AdminToggleTemplate--Z',
         usePacked => 0,
 	};
diff --git a/t/Macro/a_account.t b/t/Macro/a_account.t
index 29c63f7f9..2db2cded0 100644
--- a/t/Macro/a_account.t
+++ b/t/Macro/a_account.t
@@ -90,7 +90,7 @@ sub addTemplate {
 		className => 'WebGUI::Asset::Template',
 		url => 'a_account-test',
 		namespace => 'Macro/a_account',
-		template => "HREF=<tmpl_var account.url>\nLABEL=<tmpl_var account.text>",
+		template => "HREF=<tmpl_var account_url>\nLABEL=<tmpl_var account_text>",
 		id => 'testTemplatea_account1',
         usePacked => 1,
 	};