diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 27115ddea5e2d49560cd741d14d1b2cf56806e29..45ad13a38b995b8a3330d9790a7db245bcecccb9 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -113,6 +113,7 @@
     <td class="frmText11" width="280">{tmpl_var name='limit_dns_record_txt'}:</td>
     <td class="frmText11" width="220"><input name="limit_dns_record" type="text" class="text" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10"></td>
   </tr>
+  <tmpl_if name='is_reseller' op='!=' value='1'>
   <tr>
     <td><h2>Clients</h2></td>
   </tr>
@@ -120,6 +121,7 @@
     <td class="frmText11" width="280">{tmpl_var name='limit_client_txt'}:</td>
     <td class="frmText11" width="220"><input name="limit_client" type="text" class="text" value="{tmpl_var name='limit_client'}" size="10" maxlength="10"></td>
   </tr>
+  </tmpl_if>
   <tr>
     <td class="frmText11">&nbsp;</td>
     <td class="frmText11">&nbsp;</td>
diff --git a/server/mods-enabled/client_module.inc.php b/server/mods-enabled/client_module.inc.php
index d7de2f5544736f73b791795a5cf6ccd2ceb29ae0..a70cbdfcb72d9b3c8046439a9f4a1af40ce324c6 100644
--- a/server/mods-enabled/client_module.inc.php
+++ b/server/mods-enabled/client_module.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2008, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-class web_module {
+class client_module {
 	
 	var $module_name = 'client_module';
 	var $class_name = 'client_module';
diff --git a/server/plugins-enabled/mail_plugin.inc.php b/server/plugins-enabled/mail_plugin.inc.php
index 6e1fe30588bfed8eb5377583f04f43554c8e4b06..95ef769b9adda5b2dfb14d791e3383ece143bf59 100644
--- a/server/plugins-enabled/mail_plugin.inc.php
+++ b/server/plugins-enabled/mail_plugin.inc.php
@@ -57,7 +57,7 @@ class mail_plugin {
 		global $app, $conf;
 		
 		// Create the maildir, if it does not exist
-		if(!is_dir($data['new']['maildir']) {
+		if(!is_dir($data['new']['maildir'])) {
 			mkdir($data['new']['maildir']);
 			exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
 			$app->log('Created Maildir: '.$data['new']['maildir'],LOGLEVEL_DEBUG);
@@ -73,7 +73,7 @@ class mail_plugin {
 		$mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail');
 		
 		// Create the maildir, if it does not exist
-		if(!is_dir($data['new']['maildir']) {
+		if(!is_dir($data['new']['maildir'])) {
 			mkdir($data['new']['maildir']);
 			exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
 			$app->log('Created Maildir: '.$data['new']['maildir'],LOGLEVEL_DEBUG);