--- imp/templates/login/login.inc.dist	2006-07-19 03:30:31.000000000 +0200
+++ imp/templates/login/login.inc	2007-03-30 16:07:38.000000000 +0200
@@ -111,8 +111,14 @@
 $imenu = $menu->render();
 if ($imenu): ?>
  <span style="float:<?php echo $rightAlign ?>"><?php echo $imenu ?></span>
-<?php endif; ?>
+<?php endif;
+
+if (@is_readable(IMP_BASE . '/config/banner.php')):
+   require IMP_BASE . '/config/banner.php';
+else: ?>
  <h1 align="center"><?php echo $title ?></h1>
+<?php endif; ?>
+
 </div>
 <?php $notification->notify(array('listeners' => 'status')) ?>
 
@@ -176,12 +182,15 @@
      <td align="<?php echo $leftAlign ?>" class="light" nowrap="nowrap">
       <input type="text" tabindex="<?php echo $tabindex++ ?>" name="imapuser" value="<?php echo htmlspecialchars(Util::getFormData('imapuser')) ?>" style="direction:ltr" />
 <?php
-    if (!empty($conf['hooks']['vinfo'])) {
-        @include_once HORDE_BASE . '/config/hooks.php';
-        if (function_exists('_imp_hook_vinfo')) {
-            echo '<strong>@' . call_user_func('_imp_hook_vinfo', 'vdomain') . '</strong>';
-        }
-    }
+// vdomain should be dynamic (i. e. in Javascript), depending on the currently selected server;
+// for the time being, I have removed the static (PHP) display to avoid confusing the users.
+//  2007-03-29 <Otto.Stolz@uni-konstanz.de>
+//  if (!empty($conf['hooks']['vinfo'])) {
+//      @include_once HORDE_BASE . '/config/hooks.php';
+//      if (function_exists('_imp_hook_vinfo')) {
+//          echo '<strong>@' . call_user_func('_imp_hook_vinfo', 'vdomain') . '</strong>';
+//      }
+//  }
 ?>
      </td>
     </tr>
@@ -209,7 +218,7 @@
 <?php if (!empty($conf['server']['change_smtphost'])): ?>
     <tr style="height: 1em;"><td colspan="2"></td></tr>
 <?php endif; ?>
-<?php if (!$prefs->isLocked('language')): ?>
+<?php if (false): ?>
     <tr>
      <td align="<?php echo $rightAlign ?>" class="light"><strong><?php echo _("Language") ?></strong></td>
      <td align="<?php echo $leftAlign ?>" class="light">
