--- a/web/views/basetemplates.py	Wed May 13 09:13:26 2009 +0200
+++ b/web/views/basetemplates.py	Wed May 13 10:38:18 2009 +0200
@@ -455,7 +455,8 @@
                % html_escape(login_form_url(self.config, self.req)))
         self.w(u'<table>\n')
         self.w(u'<tr>\n')
-        self.w(u'<td><label for="__login">%s</label></td>' % _('login or email'))
+        msg = (self.config['allow-email-login'] and _('login or email')) or _('login')
+        self.w(u'<td><label for="__login">%s</label></td>' % msg)
         self.w(u'<td><input name="__login" id="__login" class="data" type="text" /></td>')
         self.w(u'</tr><tr>\n')
         self.w(u'<td><label for="__password" >%s</label></td>' % _('password'))