Index: /main/waeup.kofa/trunk/CHANGES.txt
===================================================================
--- /main/waeup.kofa/trunk/CHANGES.txt	(revision 18070)
+++ /main/waeup.kofa/trunk/CHANGES.txt	(revision 18071)
@@ -4,4 +4,6 @@
 1.8.2.dev0 (unreleased)
 =======================
+
+* Add captcha also to login page.
 
 * Allow lecturers to edit scores in state 'courses registered'
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 18070)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 18071)
@@ -365,4 +365,8 @@
                         'and authentication (login) temporarily disabled.'),
                        type='warning')
+        # Handle captcha
+        self.captcha = getUtility(ICaptchaManager).getCaptcha()
+        self.captcha_result = self.captcha.verify(self.request)
+        self.captcha_code = self.captcha.display(self.captcha_result.error_code)
         self.camefrom = camefrom
         # Prefill form with URL params
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/loginpage.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/loginpage.pt	(revision 18070)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/loginpage.pt	(revision 18071)
@@ -17,5 +17,7 @@
   <input class="btn btn-primary" type="submit" name="SUBMIT"
     tal:attributes="value view/login_button" />
-  <br /><br /><br />
+  <br /><br />
+  <div tal:content="structure view/captcha_code"></div>
+  <br /><br />
   <p  i18n:translate="login_trouble1">Don't forget to logout or exit your browser when you're done.
     If you are having trouble logging in, make sure to enable  cookies in your web browser.
