Index: chef-tool/src/webapp/vm/sitenav/login.vm
===================================================================
RCS file: /cvs/sakai/chef-tool/src/webapp/vm/sitenav/login.vm,v
retrieving revision 1.8
diff -u -F^f -r1.8 login.vm
--- chef-tool/src/webapp/vm/sitenav/login.vm    30 Jan 2005 18:31:00 -0000      1.8
+++ chef-tool/src/webapp/vm/sitenav/login.vm    8 Feb 2005 15:26:30 -0000
@@ -19,9 +19,16 @@
                                <td style="padding:2px" valign="middle" align="left">
                                        <img title="" alt="" src="${sakai_portalskin}institutional/logo_inst.gif">
                                </td>
-                               <td style="text-indent:.3em" width="100%">
+                               <td style="text-indent:.3em">
                                        <img title="" alt="" src="${sakai_portalskin}institutional/banner_inst.gif">
                                </td>
+                               #if ($alertMessage)
+                               <td>
+                                       <div class="sakaiAlertBox">
+                                               $alertMessage
+                                       </div>
+                               </td>
+                               #end
 #end
                                <td class="mast-head-r">
                                        #if ($top_login)
Index: chef-tool/src/java/org/sakaiproject/tool/sitenav/SiteNavServlet.java
===================================================================
RCS file: /cvs/sakai/chef-tool/src/java/org/sakaiproject/tool/sitenav/SiteNavServlet.java,v
retrieving revision 1.25
diff -u -F^f -r1.25 SiteNavServlet.java
--- chef-tool/src/java/org/sakaiproject/tool/sitenav/SiteNavServlet.java        5 Jan 2005 03:09:53 -0000       1.25
+++ chef-tool/src/java/org/sakaiproject/tool/sitenav/SiteNavServlet.java        8 Feb 2005 15:26:30 -0000
@@ -179,6 +179,12 @@
                        if (user != null)
                        {
                                Setup.login(user.getId(), req);
+                       } else {
+                               // in error
+                                String userIdText = ServerConfigurationService.getBoolean("email-for-user-id", true) ? "email" : "user id";
+                                setVmReference("alertMessage", "Invalid " + userIdText + " or password", req);
+
+                                return;
                        }

                        // send a parent redirect to the portal, to get to myWorkspace...