diff --git a/lib/kolab_form.php b/lib/kolab_form.php
index ec0afde..9b5b010 100644
--- a/lib/kolab_form.php
+++ b/lib/kolab_form.php
@@ -1,331 +1,333 @@
 <?php
 /*
  +--------------------------------------------------------------------------+
  | This file is part of the Kolab Web Admin Panel                           |
  |                                                                          |
  | Copyright (C) 2011-2012, Kolab Systems AG                                |
  |                                                                          |
  | 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/>      |
  +--------------------------------------------------------------------------+
  | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
  +--------------------------------------------------------------------------+
 */
 
 /**
  * HTML Form generator
  */
 class kolab_form
 {
     const INPUT_TEXT     = 1;
     const INPUT_PASSWORD = 2;
     const INPUT_TEXTAREA = 3;
     const INPUT_CHECKBOX = 4;
     const INPUT_RADIO    = 5;
     const INPUT_BUTTON   = 6;
     const INPUT_SUBMIT   = 7;
     const INPUT_SELECT   = 8;
     const INPUT_HIDDEN   = 9;
     const INPUT_CUSTOM   = 10;
     const INPUT_CONTENT  = 20;
     const INPUT_TEXTQUOTA = 30;
 
     private $attribs  = array();
     private $elements = array();
     private $sections = array();
     private $buttons  = array();
     private $title;
     private $active_section;
 
 
     /**
      * Class constructor.
      *
      * @param array $attribs  Form attributes
      */
     public function __construct($attribs = array())
     {
         $this->attribs = $attribs;
     }
 
     /**
      * Adds form section definition.
      *
      * @param string $index   Section internal index
      * @param string $legend  Section label (fieldset's legend)
      */
     public function add_section($index, $legend)
     {
         $this->sections[$index] = $legend;
     }
 
 
     /**
      * Activate form section.
      *
      * @param string $index   Section internal index
      */
     public function activate_section($index)
     {
         $this->active_section = $index;
     }
 
     /**
      * Adds form element definition.
      *
      * @param array  $attribs  Element attributes
      * @param string $section  Section index
      */
     public function add_element($attribs, $section = null)
     {
         if (!empty($section)) {
             $attribs['section'] = $section;
         }
 
         $this->elements[] = $attribs;
     }
 
     /**
      * Adds form button definition.
      *
      * @param array  $attribs   Button attributes
      */
     public function add_button($attribs)
     {
         $this->buttons[] = $attribs;
     }
 
     /**
      * Sets form title (header).
      *
      * @param string $content  Form header content
      */
     public function set_title($content)
     {
         $this->title = $content;
     }
 
     /**
      * Returns HTML output of the form.
      *
      * @return string HTML output
      */
     public function output()
     {
         $content = '';
         $hidden  = array();
 
         if (!empty($this->sections)) {
             foreach ($this->sections as $set_idx => $set) {
                 $rows = array();
 
                 foreach ($this->elements as $element) {
                     if (empty($element['section']) || $element['section'] != $set_idx) {
                         continue;
                     }
 
                     if ($element['type'] == self::INPUT_HIDDEN) {
                         $hidden[] = self::get_element($element);
                         continue;
                     }
 
                     $rows[] = $this->form_row($element);
                 }
 
                 if (!empty($rows)) {
                     $content .= "\n" . kolab_html::fieldset(array(
                         'legend'  => $set,
                         'content' => implode("\n", $rows),
                         'class'   => $this->active_section == $set_idx ? 'active' : '',
                     ));
                 }
             }
         }
 
         $rows = array();
 
         foreach ($this->elements as $element) {
             if (!empty($element['section'])) {
                 continue;
             }
 
             if ($element['type'] == self::INPUT_HIDDEN) {
                 $hidden[] = self::get_element($element);
                 continue;
             }
 
             $rows[] = $this->form_row($element);
         }
 
         if (!empty($rows)) {
             $content = implode("\n", $rows);
         }
 
         if (!empty($hidden)) {
             $content .= implode("\n", $hidden);
         }
 
         // Add form buttons
         if (!empty($this->buttons)) {
             $buttons = '';
             foreach ($this->buttons as $button) {
                 $button['type'] = 'button';
                 if (empty($button['value'])) {
                     $button['value'] = $button['label'];
                 }
                 $buttons .= kolab_html::input($button);
             }
 
             $content .= "\n" . kolab_html::div(array(
                 'class'   => 'formbuttons',
                 'content' => $buttons
             ));
         }
 
         // Build form
         $content = kolab_html::form($this->attribs, $content);
 
         // Add title element
         if ($this->title) {
             $content = kolab_html::span(array(
                 'content' => $this->title,
                 'class'   => 'formtitle',
             )) . "\n" . $content;
         }
 
         // Add event trigger, so UI can rebuild the form e.g. adding tabs
-        $content .= kolab_html::script('kadm.form_init(\'' . $this->attribs['id'] . '\')');
+        if ($this->attribs['id']) {
+            $content .= kolab_html::script('kadm.form_init(\'' . $this->attribs['id'] . '\')');
+        }
 
         return $content;
     }
 
     /**
      * Builds a row of the form table.
      */
     private function form_row($element)
     {
         $attrib['class'] = 'form-group';
 
         if (!empty($element['required']) && empty($element['readonly']) && empty($element['disabled'])) {
             $attrib['class'] .= ' required';
         }
 
         if ($element['type'] == self::INPUT_CONTENT) {
             $attrib['content'] = kolab_html::div(array(
                 'class'   => $element['class'],
                 'content' => $element['content'],
             ));
         }
         else {
             $attrib['class'] .= ' row';
             $content = self::get_element($element);
             $class   = 'col-sm-9' . ($content[0] != '<' ? ' form-control-plaintext' : '');
 
             if (is_array($element) && $element['input-group']) {
                 $class .= ' input-group';
             }
 
             $attrib['content'] = kolab_html::label(array(
                 'class'   => 'col-form-label col-sm-3',
                 'content' => $element['label'],
                 ), true)
                 . kolab_html::div(array(
                     'class'   => $class,
                     'content' => $content,
                 ));
         }
 
         return kolab_html::div($attrib);
 
         return $attrib;
     }
 
     /**
      * Builds an element of the form.
      */
     public static function get_element($attribs)
     {
         $type = isset($attribs['type']) ? $attribs['type'] : 0;
 
         if (!empty($attribs['readonly']) || !empty($attribs['disabled'])) {
             $attribs['class'] = (!empty($attribs['class']) ? $attribs['class'] . ' ' : '') . 'readonly';
         }
 
         switch ($type) {
         case self::INPUT_TEXT:
         case self::INPUT_PASSWORD:
             // INPUT type
             $attribs['type'] = $type == self::INPUT_PASSWORD ? 'password' : 'text';
             // INPUT size
             if (empty($attribs['size'])) {
                 $attribs['size'] = 40;
                 if (!empty($attribs['maxlength'])) {
                     $attribs['size'] = $attribs['maxlength'] > 10 ? 40 : 10;
                 }
             }
 
             $content = kolab_html::input($attribs);
             break;
 
         case self::INPUT_TEXTQUOTA:
             $attribs['type'] = 'text';
             $content = kolab_html::inputquota($attribs);
             break;
 
         case self::INPUT_CHECKBOX:
             $attribs['type'] = 'checkbox';
             $content = kolab_html::input($attribs);
             break;
 
         case self::INPUT_HIDDEN:
             $attribs['type'] = 'hidden';
             $content = kolab_html::input($attribs);
             break;
 
         case self::INPUT_TEXTAREA:
             if (empty($attribs['rows'])) {
                 $attribs['rows'] = 5;
             }
             if (empty($attribs['cols'])) {
                 $attribs['cols'] = 50;
             }
 
             $content = kolab_html::textarea($attribs, true);
             break;
 
         case self::INPUT_SELECT:
             if (!empty($attribs['multiple']) && empty($attribs['size'])) {
                 $attribs['size'] = 5;
             }
 
             $content = kolab_html::select($attribs, empty($attribs['escaped']));
             break;
 
         case self::INPUT_CUSTOM:
         default:
             if (is_array($attribs)) {
                 $content = isset($attribs['value']) ? $attribs['value'] : '';
             }
             else {
                 $content = $attribs;
             }
         }
 
         if (!empty($attribs['suffix'])) {
             $content .= ' ' . $attribs['suffix'];
         }
 
         return $content;
     }
 
 }