Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 9704)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 9705)
@@ -259,5 +259,9 @@
                         return
                     # Now we know that the student is suspended.
-                    self.flash(_('Your account has been deactivated.'))
+                    comment = getattr(student, 'suspended_comment', None)
+                    if comment:
+                        self.flash(comment)
+                    else:
+                        self.flash(_('Your account has been deactivated.'))
                     return
             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 9704)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 9705)
@@ -1790,5 +1790,14 @@
         self.browser.getControl("Login").click()
         self.assertMatches(
-            '...Your account has been deactivated...', self.browser.contents)
+            '...<div class="alert-message warning">'
+            'Your account has been deactivated.</div>...', self.browser.contents)
+        # If suspended_comment is set this message will be flashed instead
+        self.student.suspended_comment = u'Aetsch baetsch!'
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.assertMatches(
+            '...<div class="alert-message warning">Aetsch baetsch!</div>...',
+            self.browser.contents)
         self.student.suspended = False
         # Students can't login if a temporary password has been set and
