diff --git a/lib/Config.php b/lib/Config.php
index 08b8bac..cf19c9d 100644
--- a/lib/Config.php
+++ b/lib/Config.php
@@ -6,6 +6,8 @@ class Config {
   const CONFIG_KEY = 'ct_auto_mail_hooks';
   const CONFIG_KEY_GLESYS_KEYS="glesys_keys";
   const CONFIG_KEY_EMAIL_ADDR_SUFFIX="email_suffix";
+  const CONFIG_KEY_EMAIL_ADDR_QUOTA_MB="quota";
+  const DEFAULT_EMAIL_ADDR_QUOTA_MB="200";
   private $logger;
   private $appConfiguration;
   private $logContext = ['app' => 'ct_auto_mail_hooks'];
@@ -19,7 +21,14 @@ class Config {
   public function getEmailAddressSuffix() {
       return $this->getConfValue(self::CONFIG_KEY_EMAIL_ADDR_SUFFIX);
   }
+  public function getEmailQuotaMB() {
+      $quota = $this->getConfValue(self::CONFIG_KEY_EMAIL_ADDR_QUOTA_MB);
+      return is_null($quota) ?  self::DEFAULT_EMAIL_ADDR_QUOTA_MB : $quota;
+  }
   private function getConfValue($configKey) {
-      return $this->appConfiguration[$configKey];
+      if(array_key_exists($configKey, $this->appConfiguration)){
+        return $this->appConfiguration[$configKey];
+      }
+      return NULL;
   }
 }
diff --git a/lib/Hooks/UserHooks.php b/lib/Hooks/UserHooks.php
index 96ad3c1..f5879da 100644
--- a/lib/Hooks/UserHooks.php
+++ b/lib/Hooks/UserHooks.php
@@ -25,11 +25,13 @@ class UserHooks {
             $uid = $user->getUID();
             $name = $user->getDisplayName();
             $email_suffix = $this->config->getEmailAddressSuffix();
+            $quota = $this->config->getEmailQuotaMB();
             $newuser = array(
                 'userid' => $uid,
                 'password' => $password,
                 'name' => $name,
-                'email' => $uid . $email_suffix
+                'email' => $uid . $email_suffix,
+                'quota' => $quota // in MB
             );
             $this->logger->warning("newuser:". print_r($newuser,1));
             if($this->createEmailAccount($newuser)) {