--- loncom/auth/lonauth.pm	2001/06/02 16:10:04	1.19
+++ loncom/auth/lonauth.pm	2001/08/04 00:39:32	1.22
@@ -5,6 +5,8 @@
 # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,
 # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,
 # 05/28,05/29 Gerd Kortemeyer
+# 07/24 Scott Harrison
+# 07/28,08/03 Gerd Kortemeyer
 
 package Apache::lonauth;
 
@@ -120,10 +122,10 @@ sub success {
 
 # ------------------------------------------------- Check for critical messages
 
-    my @what=&Apache::lonnet::dump('critical');
+    my @what=&Apache::lonnet::dump('critical',$domain,$username);
     if ($what[0]) {
-	if ($what[0] ne 'con_lost') {
-	    $lowerurl='/adm/email/critical/'.$what[0];
+	if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
+	    $lowerurl='/adm/email?critical=display';
         }
     }
 
@@ -177,13 +179,16 @@ function main() {
 
 </script>
 </head>
-<body bgcolor="#FFFFFF" onLoad="main();">
+<body bgcolor="#FFFFFF">
 <script>
     menuloaded=0;
     tim=0;
 </script>
 $windowinfo
 <h1>Welcome!</h1>
+<script>
+    main();
+</script>
 </body>
 </html>
 ENDSUCCESS
