diff --git a/webui/controller/group/add.php b/webui/controller/group/add.php
index 8d83473..a7a0f5a 100644
--- a/webui/controller/group/add.php
+++ b/webui/controller/group/add.php
@@ -41,14 +41,10 @@
 
             if($ret == 0) {
 
-               //$this->data['post'] = $this->request->post;
-               //$this->data['next_group_id'] = $this->model_group_group->getNextUid();
+               $this->data['post'] = $this->request->post;
 
             }
          }
-         else {
-            //$this->data['next_group_id'] = $this->model_group_group->getNextUid();
-         }
       }
       else {
          $this->template = "common/error.tpl";
@@ -68,6 +64,9 @@
          $this->error['group'] = $this->data['text_missing_data'];
       }
 
+      if(!isset($this->request->post['email']) || $this->request->post['email'] == '') {
+         $this->error['email'] = $this->data['text_missing_data'];
+      }
 
       if (!$this->error) {
          return true;
diff --git a/webui/language/en/messages.php b/webui/language/en/messages.php
index 0ae7bea..64e554a 100644
--- a/webui/language/en/messages.php
+++ b/webui/language/en/messages.php
@@ -76,13 +76,14 @@
 $_['text_edit'] = "Edit";
 $_['text_edit_or_view'] = "Edit/view";
 $_['text_email'] = "Email address";
-$_['text_email_addresses'] = "Email address(es)";
+$_['text_email_addresses'] = "Email addresses";
 $_['text_email_aliases'] = "Email aliases";
 $_['text_email_in_unknown_domain'] = "Email address is in an unknown domain";
 $_['text_empty_search_criteria'] = "'Empty criteria'";
 $_['text_empty_search_result'] = "Empty search result";
 $_['text_enable'] = "Enable";
 $_['text_enabled'] = "enabled";
+$_['text_enter_one_email_address_per_line'] = "Enter one email address per line";
 $_['text_enter_search_terms'] = "Enter your search terms";
 $_['text_error'] = "Error";
 $_['text_exact_domain_name_or_email_address'] = "exact domain name or email address";
diff --git a/webui/language/hu/messages.iso-8859-2.php b/webui/language/hu/messages.iso-8859-2.php
index a36b8eb..c59f4c9 100644
--- a/webui/language/hu/messages.iso-8859-2.php
+++ b/webui/language/hu/messages.iso-8859-2.php
@@ -76,13 +76,14 @@
 $_['text_edit'] = "Szerkeszt";
 $_['text_edit_or_view'] = "Szerkeszt/Megn�z";
 $_['text_email'] = "Email c�m";
-$_['text_email_addresses'] = "Email c�m(ek)";
+$_['text_email_addresses'] = "Email c�mek";
 $_['text_email_aliases'] = "Email �lc�mek";
 $_['text_email_in_unknown_domain'] = "Az email c�m ismeretlen domainben van";
 $_['text_empty_search_criteria'] = "'�res felt�tel'";
 $_['text_empty_search_result'] = "Nincs tal�lat a keres�sre";
 $_['text_enable'] = "Enged�lyez";
 $_['text_enabled'] = "enged�lyezve";
+$_['text_enter_one_email_address_per_line'] = "Egy sorba egy email c�met �rjon";
 $_['text_enter_search_terms'] = "�rja be a keres�si felt�teleket";
 $_['text_error'] = "Hiba";
 $_['text_exact_domain_name_or_email_address'] = "pontos domainn�v vagy email c�m";
diff --git a/webui/language/hu/messages.php b/webui/language/hu/messages.php
index 7da603d..e99ab72 100644
--- a/webui/language/hu/messages.php
+++ b/webui/language/hu/messages.php
@@ -76,13 +76,14 @@
 $_['text_edit'] = "Szerkeszt";
 $_['text_edit_or_view'] = "Szerkeszt/Megnéz";
 $_['text_email'] = "Email cím";
-$_['text_email_addresses'] = "Email cím(ek)";
+$_['text_email_addresses'] = "Email címek";
 $_['text_email_aliases'] = "Email álcímek";
 $_['text_email_in_unknown_domain'] = "Az email cím ismeretlen domainben van";
 $_['text_empty_search_criteria'] = "'Üres feltétel'";
 $_['text_empty_search_result'] = "Nincs találat a keresésre";
 $_['text_enable'] = "Engedélyez";
 $_['text_enabled'] = "engedélyezve";
+$_['text_enter_one_email_address_per_line'] = "Egy sorba egy email címet írjon";
 $_['text_enter_search_terms'] = "Írja be a keresési feltételeket";
 $_['text_error'] = "Hiba";
 $_['text_exact_domain_name_or_email_address'] = "pontos domainnév vagy email cím";
diff --git a/webui/view/theme/default/templates/group/add.tpl b/webui/view/theme/default/templates/group/add.tpl
index 9aacf68..2781274 100644
--- a/webui/view/theme/default/templates/group/add.tpl
+++ b/webui/view/theme/default/templates/group/add.tpl
@@ -14,12 +14,18 @@
       </div>
 
       <div class="domainrow">
-         <div class="domaincell"><?php print $text_email_addresses; ?>:</div>
-         <div class="domaincell"><textarea style="height:280px;" name="email" class="domain"><?php if(isset($post['email'])){ print $post['email']; } ?></textarea></div>
+         <div class="domaincell"><?php print $text_email_addresses; ?>*:</div>
+         <div class="domaincell"><textarea style="height:280px;" name="email" id="email" class="domain"><?php if(isset($post['email'])){ print $post['email']; } ?></textarea></div>
       </div>
 
       <div class="domainrow">
          <div class="domaincell">&nbsp;</div>
+         <div class="domaincell">*: <?php print $text_enter_one_email_address_per_line; ?></div>
+      </div>
+
+
+      <div class="domainrow">
+         <div class="domaincell">&nbsp;</div>
          <div class="domaincell"><input type="submit" value="<?php print $text_add; ?>" /><input type="reset" value="<?php print $text_cancel; ?>" /></div>
       </div>
 
diff --git a/webui/view/theme/default/templates/group/edit.tpl b/webui/view/theme/default/templates/group/edit.tpl
index ba15042..ee11bca 100644
--- a/webui/view/theme/default/templates/group/edit.tpl
+++ b/webui/view/theme/default/templates/group/edit.tpl
@@ -13,12 +13,17 @@
       </div>
 
       <div class="domainrow">
-         <div class="domaincell"><?php print $text_email_addresses; ?>:</div>
+         <div class="domaincell"><?php print $text_email_addresses; ?>*:</div>
          <div class="domaincell"><textarea style="height:280px;" name="email" class="domain"><?php if(isset($email)){ print $email; } ?></textarea></div>
       </div>
 
       <div class="domainrow">
          <div class="domaincell">&nbsp;</div>
+         <div class="domaincell">*: <?php print $text_enter_one_email_address_per_line; ?></div>
+      </div>
+
+      <div class="domainrow">
+         <div class="domaincell">&nbsp;</div>
          <div class="domaincell"><input type="submit" value="<?php print $text_modify; ?>" /><input type="reset" value="<?php print $text_cancel; ?>" /></div>
       </div>