--- loncom/auth/lonlogin.pm	2006/11/15 00:53:48	1.84
+++ loncom/auth/lonlogin.pm	2007/01/13 20:39:57	1.86
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.84 2006/11/15 00:53:48 raeburn Exp $
+# $Id: lonlogin.pm,v 1.86 2007/01/13 20:39:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,8 +84,7 @@ sub handler {
     my $lonid=$cookies{'lonID'};
     my $cookie;
     if ($lonid) {
-	my $handle=$lonid->value;
-        $handle=~s/\W//g;
+	my $handle=&LONCAPA::clean_handle($lonid->value);
         my $lonidsdir=$r->dir_config('lonIDsDir');
 	if (-e "$lonidsdir/$handle.id") {
 # Is there an existing token file?
@@ -420,24 +419,25 @@ ENDSERVERFORM
    
    <!-- A cell that will hold the 'access', 'about', and 'catalog' links -->
    <!-- Row 3 Column 1 -->
-   <td valign="top" height=60 align="left" bgcolor="$sidebg">
+   <td valign="top" height="60" align="left" bgcolor="$sidebg">
     <table cellpadding="0" cellspacing="2" border="0">
      <tr>
       <td>&nbsp;</td>
       <td><a href="/adm/login?interface=textual"><b>$lt{'access'}</b></a></td>
-    </tr>
-    <tr>
-     <td>&nbsp;</td>
-     <td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td>
-    </tr>
-    <tr>
-     <td>&nbsp;</td>
-     <td><a href="/adm/coursecatalog"><b>$lt{'catalog'}</b></a></td>
-    </tr>
-    <tr>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+      <td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+      <td><a href="/adm/coursecatalog"><b>$lt{'catalog'}</b></a></td>
+     </tr>
+     <tr>
       <td colspan="2">&nbsp;</td>
-    </tr>
-   </table>
+     </tr>
+    </table>
+   </td>
    <!-- The shaded space between the two main columns -->
    <!-- Row 3 Column 2 -->
    <td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>