diff --git a/plugins/logon_page/logon_page.php b/plugins/logon_page/logon_page.php
index 4247a36e..6e00a15a 100644
--- a/plugins/logon_page/logon_page.php
+++ b/plugins/logon_page/logon_page.php
@@ -1,72 +1,76 @@
 <?php
 
 /**
  * Logon screen additions.
  *
  * Allows to display additional information (HTML code block) on logon page.
  *
  * Configuration: put your content in logon_page.html file. It will be parsed by
  * Roundcube templates engine, so you can use all template features (tags).
  *
  * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * Copyright (C) 2012-2015, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 class logon_page extends rcube_plugin
 {
     public $task    = 'login';
     public $noajax  = true;
     public $noframe = true;
 
     /**
      * Plugin initialization
      */
     public function init()
     {
         $this->add_hook('template_object_loginform', array($this, 'logon_page_content'));
     }
 
     /**
      * Login form object container handler. The content will be
      * added to the BODY tag, not the container element itself.
      */
     public function logon_page_content($args)
     {
         $file = $this->home . '/logon_page.html';
 
         if (file_exists($file)) {
             $html = file_get_contents($file);
+            $html = trim(str_replace('<!-- Put HTML content here -->', '', $html));
         }
 
         if ($html) {
             $rcmail = rcube::get_instance();
 
             // Parse content with templates engine, so we can use e.g. localization
             $html = $rcmail->output->just_parse($html);
 
             // Wrap the additional content inside <div>,
             // so it can be styled by skins
             $html = '<div id="logon_page">' . $html . '</div>';
 
+            // In Elastic we have to move the element to more apropriate place
+            $html .= "<script>\$('#login-footer').append(\$('#logon_page'));</script>";
+
             // Add the content at the end of the BODY
             $rcmail->output->add_footer($html);
         }
 
         return $args;
     }
 }