Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 8983)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 8984)
@@ -493,8 +493,20 @@
             self.browser.headers['content-length'], str(PH_LEN))
 
+    def test_applicant_login(self):
+        self.applicant.suspended = True
+        self.login()
+        self.assertTrue(
+            'You entered invalid credentials.' in self.browser.contents)
+        self.applicant.suspended = False
+        self.browser.getControl("Login").click()
+        self.assertTrue(
+            'You logged in.' in self.browser.contents)
+
     def test_applicant_access(self):
         # Applicants can edit their record
         self.browser.open(self.login_path)
         self.login()
+        self.assertTrue(
+            'You logged in.' in self.browser.contents)
         self.browser.open(self.edit_path)
         self.assertTrue(self.browser.url != self.login_path)
Index: /main/waeup.kofa/trunk/src/waeup/kofa/authentication.txt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/authentication.txt	(revision 8983)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/authentication.txt	(revision 8984)
@@ -177,5 +177,5 @@
   >>> browser.getControl(name='form.password').value = 'invalidpw'
   >>> browser.getControl('Login').click()
-  >>> 'You entered wrong credentials' in browser.contents
+  >>> 'You entered invalid credentials' in browser.contents
   True
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 8983)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 8984)
@@ -193,5 +193,5 @@
                 self.redirect(self.camefrom)
                 return
-            self.flash(_('You entered wrong credentials.'))
+            self.flash(_('You entered invalid credentials.'))
 
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 8983)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 8984)
@@ -1147,8 +1147,16 @@
         # and can perform actions
         IWorkflowInfo(self.student).fireTransition('admit')
+        # Students can't login if their account is suspended
+        self.student.suspended = True
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = self.student_id
         self.browser.getControl(name="form.password").value = 'spwd'
         self.browser.getControl("Login").click()
+        self.assertTrue(
+            'You entered invalid credentials.' in self.browser.contents)
+        self.student.suspended = False
+        self.browser.getControl("Login").click()
+        self.assertTrue(
+            'You logged in.' in self.browser.contents)
         # Student can upload a passport picture
         self.browser.open(self.student_path + '/change_portrait')
