diff --git a/lib/WebGUI/Authentication/LDAP.pm b/lib/WebGUI/Authentication/LDAP.pm
index 87bed3b61..8636e9d1d 100644
--- a/lib/WebGUI/Authentication/LDAP.pm
+++ b/lib/WebGUI/Authentication/LDAP.pm
@@ -66,13 +66,13 @@ sub authenticate {
 #-------------------------------------------------------------------
 sub adminForm {
 	my $userData = WebGUI::Authentication::getParams($_[0],'LDAP');
-	my $ldapURL = $session{form}{ldapURL} || $userData->{ldapURL} || $session{setting}{ldapURL};
-	my $connectDN = $session{form}{connectDN} || $userData->{connectDN};
+	my $ldapURL = $session{form}{authLDAP.ldapURL} || $userData->{ldapURL} || $session{setting}{ldapURL};
+	my $connectDN = $session{form}{authLDAP.connectDN} || $userData->{connectDN};
 	my $f;
 	$f = WebGUI::HTMLForm->new;
 	$f->readOnly('<b>'.optionsLabel().'</b>');
-	$f->url("ldapURL",WebGUI::International::get(3,'Auth/LDAP'),$ldapURL);
-	$f->text("connectDN",WebGUI::International::get(4,'Auth/LDAP'),$connectDN);
+	$f->url("authLDAP.ldapURL",WebGUI::International::get(3,'Auth/LDAP'),$ldapURL);
+	$f->text("authLDAP.connectDN",WebGUI::International::get(4,'Auth/LDAP'),$connectDN);
 	return $f->printRowsOnly;
 }
 
@@ -80,8 +80,8 @@ sub adminForm {
 sub adminFormSave {
 	WebGUI::Authentication::saveParams($_[0],'LDAP',
 	{
-		connectDN 	=> $session{form}{connectDN}, 
-		ldapURL 	=> $session{form}{ldapURL}
+		connectDN 	=> $session{form}{authLDAP.connectDN}, 
+		ldapURL 	=> $session{form}{authLDAP.ldapURL}
 	});
 }
 
@@ -99,8 +99,8 @@ sub optionsLabel {
 sub registrationForm {
 	my $f;
 	$f = WebGUI::HTMLForm->new;
-	$f->text("ldapId",$session{setting}{ldapIdName});
-	$f->password("ldapPassword",$session{setting}{ldapPasswordName});
+	$f->text("authLDAP.ldapId",$session{setting}{ldapIdName});
+	$f->password("authLDAP.ldapPassword",$session{setting}{ldapPasswordName});
 	return $f->printRowsOnly;
 }
 
@@ -117,7 +117,7 @@ sub registrationFormSave {
 	%args = (port => $port);
 	$ldap = Net::LDAP->new($uri->host, %args);
 	$ldap->bind;
-	$search = $ldap->search (base => $uri->dn, filter => $session{setting}{ldapId}."=".$session{form}{ldapId});
+	$search = $ldap->search (base => $uri->dn, filter => $session{setting}{ldapId}."=".$session{form}{authLDAP.ldapId});
 	if (defined $search->entry(0)) {
 		$connectDN = "cn=".$search->entry(0)->get_value("cn");
 	}
@@ -127,7 +127,7 @@ sub registrationFormSave {
 		connectDN 	=> $connectDN, 
 		ldapURL 	=> $session{setting}{ldapURL}
 	});
-	return $session{form}{ldapId};
+	return $session{form}{authLDAP.ldapId};
 }
 
 #-------------------------------------------------------------------
@@ -141,15 +141,15 @@ sub registrationFormValidate {
         }
 	if ($ldap = Net::LDAP->new($uri->host, {port=>$port})) {
         	if ($ldap->bind) {
-        		$search = $ldap->search (base=>$uri->dn,filter=>$session{setting}{ldapId}."=".$session{form}{ldapId});
+        		$search = $ldap->search (base=>$uri->dn,filter=>$session{setting}{ldapId}."=".$session{form}{authLDAP.ldapId});
         		if (defined $search->entry(0)) {
                 		$connectDN = "cn=".$search->entry(0)->get_value("cn");
                 		$ldap->unbind;
                 		$ldap = Net::LDAP->new($uri->host, {port=>$port}) or $error .= WebGUI::International::get(2,'Auth/LDAP');
-                		$auth = $ldap->bind(dn=>$connectDN, password=>$session{form}{ldapPassword});
+                		$auth = $ldap->bind(dn=>$connectDN, password=>$session{form}{authLDAP.ldapPassword});
                 		if ($auth->code == 48 || $auth->code == 49) {
                         		$error .= '<li>'.WebGUI::International::get(68);
-                        		WebGUI::ErrorHandler::warn("Invalid LDAP information for registration of LDAP ID: ".$session{form}{ldapId});
+                        		WebGUI::ErrorHandler::warn("Invalid LDAP information for registration of LDAP ID: ".$session{form}{authLDAP.ldapId});
                 		} elsif ($auth->code > 0) {
                         		$error .= '<li>LDAP error "'.$ldapStatusCode{$auth->code}.'" occured. '
 						.WebGUI::International::get(69);
@@ -158,7 +158,7 @@ sub registrationFormValidate {
                 		$ldap->unbind;
         		} else {
                 		$error .= '<li>'.WebGUI::International::get(68);
-                		WebGUI::ErrorHandler::warn("Invalid LDAP information for registration of LDAP ID: ".$session{form}{ldapId});
+                		WebGUI::ErrorHandler::warn("Invalid LDAP information for registration of LDAP ID: ".$session{form}{authLDAP.ldapId});
         		}
 		} else {
 			$error = WebGUI::International::get(2,'Auth/LDAP');
@@ -174,10 +174,10 @@ sub settingsForm {
 	my $f;
 	$f = WebGUI::HTMLForm->new;
 	$f->readOnly('<b>'.optionsLabel().'</b>');
-	$f->url("ldapURL",WebGUI::International::get(5,'Auth/LDAP'),$session{setting}{ldapURL});
-        $f->text("ldapId",WebGUI::International::get(6,'Auth/LDAP'),$session{setting}{ldapId});
-        $f->text("ldapIdName",WebGUI::International::get(7,'Auth/LDAP'),$session{setting}{ldapIdName});
-        $f->text("ldapPasswordName",WebGUI::International::get(8,'Auth/LDAP'),$session{setting}{ldapPasswordName});
+	$f->url("authLDAP.ldapURL",WebGUI::International::get(5,'Auth/LDAP'),$session{setting}{ldapURL});
+        $f->text("authLDAP.ldapId",WebGUI::International::get(6,'Auth/LDAP'),$session{setting}{ldapId});
+        $f->text("authLDAP.ldapIdName",WebGUI::International::get(7,'Auth/LDAP'),$session{setting}{ldapIdName});
+        $f->text("authLDAP.ldapPasswordName",WebGUI::International::get(8,'Auth/LDAP'),$session{setting}{ldapPasswordName});
 	return $f->printRowsOnly;
 }
 
diff --git a/lib/WebGUI/Authentication/SMB.pm.disabled b/lib/WebGUI/Authentication/SMB.pm.disabled
index 1d2502059..2d573b5c9 100644
--- a/lib/WebGUI/Authentication/SMB.pm.disabled
+++ b/lib/WebGUI/Authentication/SMB.pm.disabled
@@ -43,17 +43,17 @@ sub authenticate {
 #-------------------------------------------------------------------
 sub adminForm {
 	my $userData = WebGUI::Authentication::getParams($_[0], 'SMB');
-	my $pdc = $session{form}{smbPDC} || $userData->{smbPDC} || $session{setting}{smbPDC};
-	my $bdc = $session{form}{smbBDC} || $userData->{smbBDC} || $session{setting}{smbBDC};
-	my $domain = $session{form}{smbDomain} || $userData->{smbDomain} || $session{setting}{smbDomain};
-	my $login = $session{form}{smbLogin} || $userData->{smbLogin};
+	my $pdc = $session{form}{authSMB.smbPDC} || $userData->{smbPDC} || $session{setting}{smbPDC};
+	my $bdc = $session{form}{authSMB.smbBDC} || $userData->{smbBDC} || $session{setting}{smbBDC};
+	my $domain = $session{form}{authSMB.smbDomain} || $userData->{smbDomain} || $session{setting}{smbDomain};
+	my $login = $session{form}{authSMB.smbLogin} || $userData->{smbLogin};
 	my $f;
 	$f = WebGUI::HTMLForm->new;
 	$f->readOnly('<b>'.optionsLabel().'</b>');
-	$f->text("smbPDC",WebGUI::International::get(5,'Auth/SMB'),$pdc);
-	$f->text("smbBDC",WebGUI::International::get(6,'Auth/SMB'),$bdc);
-	$f->text("smbDomain",WebGUI::International::get(7,'Auth/SMB'),$domain);
-	$f->text("smbLogin",WebGUI::International::get(8,'Auth/SMB'),$login);
+	$f->text("authSMB.smbPDC",WebGUI::International::get(5,'Auth/SMB'),$pdc);
+	$f->text("authSMB.smbBDC",WebGUI::International::get(6,'Auth/SMB'),$bdc);
+	$f->text("authSMB.smbDomain",WebGUI::International::get(7,'Auth/SMB'),$domain);
+	$f->text("authSMB.smbLogin",WebGUI::International::get(8,'Auth/SMB'),$login);
 	return $f->printRowsOnly;
 }
 
@@ -61,10 +61,10 @@ sub adminForm {
 sub adminFormSave {
 	WebGUI::Authentication::saveParams($session{form}{uid},'SMB', 
 	{
-		smbPDC 		=> $session{form}{smbPDC}, 
-		smbBDC 		=> $session{form}{smbBDC},
-		smbDomain 	=> $session{form}{smbDomain},
-		smbLogin 	=> $session{form}{smbLogin}
+		smbPDC 		=> $session{form}{authSMB.smbPDC}, 
+		smbBDC 		=> $session{form}{authSMB.smbBDC},
+		smbDomain 	=> $session{form}{authSMB.smbDomain},
+		smbLogin 	=> $session{form}{authSMB.smbLogin}
 	});
 }
 
@@ -77,8 +77,8 @@ sub optionsLabel {
 sub registrationForm {
 	my $f;
 	$f = WebGUI::HTMLForm->new;
-	$f->text("loginId",WebGUI::International::get(8,'Auth/SMB'));
-	$f->password("smbPassword",WebGUI::International::get(9,'Auth/SMB'));
+	$f->text("authSMB.loginId",WebGUI::International::get(8,'Auth/SMB'));
+	$f->password("authSMB.smbPassword",WebGUI::International::get(9,'Auth/SMB'));
 	return $f->printRowsOnly;
 }
 
@@ -91,7 +91,7 @@ sub registrationFormSave {
 		smbPDC 		=> $session{setting}{smbPDC}, 
 		smbBDC 		=> $session{setting}{smbBDC},
 		smbDomain 	=> $session{setting}{smbDomain},
-		smbLogin 	=> $session{form}{loginId}
+		smbLogin 	=> $session{form}{authSMB.loginId}
 	});
 }
 
@@ -101,8 +101,8 @@ sub registrationFormValidate {
         $pdc = $session{setting}{smbPDC};
        	$bdc = $session{setting}{smbBDC};
         $ntDomain = $session{setting}{smbDomain};
-        $smbLogin = $session{form}{loginId};
-        $smb = Authen::Smb::authen($smbLogin, $session{form}{smbPassword}, $pdc, $bdc, $ntDomain);
+        $smbLogin = $session{form}{authSMB.loginId};
+        $smb = Authen::Smb::authen($smbLogin, $session{form}{authSMB.smbPassword}, $pdc, $bdc, $ntDomain);
         if ($smb > 0) {
                 $error = '<li>'. $smbError{$smb} . "pdc: $pdc, bdc: $bdc, domain: $ntDomain";
         }
@@ -115,9 +115,9 @@ sub settingsForm {
 	my $f;
 	$f = WebGUI::HTMLForm->new;
 	$f->readOnly('<b>'.optionsLabel().'</b>');
-	$f->text("smbPDC",WebGUI::International::get(5,'Auth/SMB'),$session{setting}{smbPDC});
-	$f->text("smbBDC",WebGUI::International::get(6,'Auth/SMB'),$session{setting}{smbBDC});
-	$f->text("smbDomain",WebGUI::International::get(7,'Auth/SMB'),$session{setting}{smbDomain});
+	$f->text("authSMB.smbPDC",WebGUI::International::get(5,'Auth/SMB'),$session{setting}{smbPDC});
+	$f->text("authSMB.smbBDC",WebGUI::International::get(6,'Auth/SMB'),$session{setting}{smbBDC});
+	$f->text("authSMB.smbDomain",WebGUI::International::get(7,'Auth/SMB'),$session{setting}{smbDomain});
 	return $f->printRowsOnly;
 }
 
diff --git a/lib/WebGUI/Authentication/WebGUI.pm b/lib/WebGUI/Authentication/WebGUI.pm
index fd03ae119..51dc7e99b 100644
--- a/lib/WebGUI/Authentication/WebGUI.pm
+++ b/lib/WebGUI/Authentication/WebGUI.pm
@@ -37,14 +37,14 @@ sub adminForm {
 	my $f;
 	$f = WebGUI::HTMLForm->new;
 	$f->readOnly('<b>'.optionsLabel().'</b>');
-	$f->password("identifier",WebGUI::International::get(51),"password");
+	$f->password("authWebGUI.identifier",WebGUI::International::get(51),"password");
 	return $f->printRowsOnly;
 }
 
 #-------------------------------------------------------------------
 sub adminFormSave {
-	unless ($session{form}{identifier} eq "password") {
-		WebGUI::Authentication::saveParams($_[0],'WebGUI',{identifier => Digest::MD5::md5_base64($session{form}{identifier})});
+	unless ($session{form}{authWebGUI.identifier} eq "password") {
+		WebGUI::Authentication::saveParams($_[0],'WebGUI',{identifier => Digest::MD5::md5_base64($session{form}{authWebGUI.identifier})});
 	}
 }
 
@@ -62,8 +62,8 @@ sub optionsLabel {
 sub registrationForm {
 	my $f;
 	$f = WebGUI::HTMLForm->new;
-	$f->password("identifier",WebGUI::International::get(51));
-	$f->password("identifierConfirm",WebGUI::International::get(2,'Auth/WebGUI'));
+	$f->password("authWebGUI.identifier",WebGUI::International::get(51));
+	$f->password("authWebGUI.identifierConfirm",WebGUI::International::get(2,'Auth/WebGUI'));
 	return $f->printRowsOnly;
 }
 
@@ -75,13 +75,13 @@ sub registrationFormSave {
 #-------------------------------------------------------------------
 sub registrationFormValidate {
 	my ($error);
-        if ($session{form}{identifier} ne $session{form}{identifierConfirm}) {
+        if ($session{form}{authWebGUI.identifier} ne $session{form}{authWebGUI.identifierConfirm}) {
                 $error = '<li>'.WebGUI::International::get(3,'Auth/WebGUI');
         }
-        if ($session{form}{identifier} eq "password") {
+        if ($session{form}{authWebGUI.identifier} eq "password") {
                 $error .= '<li>'.WebGUI::International::get(5,'Auth/WebGUI');
         }
-        if ($session{form}{identifier} eq "") {
+        if ($session{form}{authWebGUI.identifier} eq "") {
                 $error .= '<li>'.WebGUI::International::get(4,'Auth/WebGUI');
         }
         return $error;
@@ -96,8 +96,8 @@ sub settingsForm {
 sub userForm {
         my $f;
         $f = WebGUI::HTMLForm->new;
-        $f->password("identifier",WebGUI::International::get(51),"password");
-        $f->password("identifierConfirm",WebGUI::International::get(2,'Auth/WebGUI'),"password");
+        $f->password("authWebGUI.identifier",WebGUI::International::get(51),"password");
+        $f->password("authWebGUI.identifierConfirm",WebGUI::International::get(2,'Auth/WebGUI'),"password");
         return $f->printRowsOnly;
 }
 
@@ -109,10 +109,10 @@ sub userFormSave {
 #-------------------------------------------------------------------
 sub userFormValidate {
         my ($error);
-        if ($session{form}{identifier} ne $session{form}{identifierConfirm}) {
+        if ($session{form}{authWebGUI.identifier} ne $session{form}{identifierConfirm}) {
                 $error = '<li>'.WebGUI::International::get(3,'Auth/WebGUI');
         }
-        if ($session{form}{identifier} eq "") {
+        if ($session{form}{authWebGUI.identifier} eq "") {
                 $error .= '<li>'.WebGUI::International::get(4,'Auth/WebGUI');
         }
         return $error;