--- loncom/interface/domainprefs.pm	2007/06/01 01:14:51	1.18
+++ loncom/interface/domainprefs.pm	2007/06/04 14:14:27	1.20
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.18 2007/06/01 01:14:51 albertel Exp $
+# $Id: domainprefs.pm,v 1.20 2007/06/04 14:14:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -853,10 +853,11 @@ sub print_autoupdate {
         if (keys(%{$usertypes}) > 0) {
             $othertitle = &mt('Other users');
         }
-        my @fields = ('lastname','firstname','middlename','gen','email','id');
+        my @fields = ('lastname','firstname','middlename','gen',
+                      'permanentemail','id');
         my %fieldtitles = &Apache::lonlocal::texthash (
                             id => 'Student/Employee ID',
-                            email => 'E-mail address',
+                            permanentemail => 'E-mail address',
                             lastname => 'Last Name',
                             firstname => 'First Name',
                             middlename => 'Middle Name',
@@ -1519,7 +1520,6 @@ sub check_switchserver {
     }
     my @ids=&Apache::lonnet::current_machine_ids();
     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-    $allowed=0;
     if (!$allowed) {
 	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
     }
@@ -1662,7 +1662,7 @@ sub modify_autoupdate {
     my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
     my %fieldtitles = &Apache::lonlocal::texthash (
                         id => 'Student/Employee ID',
-                        email => 'E-mail address',
+                        permanentemail => 'E-mail address',
                         lastname => 'Last Name',
                         firstname => 'First Name',
                         middlename => 'Middle Name',