diff --git a/debian/control b/debian/control
index 18547db3..be54f515 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: http://postfixadmin.sourceforge.net
 
 Package: postfixadmin
 Architecture: all
-Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php5 | php5-cgi | php5, php5-cli, php5-imap, php5-mysql | php5-pgsql, mysql-client | postgresql-client, ${misc:Depends}
+Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php5 | php5-cgi | php5, php5-cli, php5-imap, php5-mysql | php5-mysqlnd | php5-pgsql, mysql-client | postgresql-client, ${misc:Depends}
 Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server
 Suggests: dovecot-common | courier-authlib-mysql | courier-authlib-postgresql
 Description: Virtual mail hosting interface for Postfix
diff --git a/model/AliasHandler.php b/model/AliasHandler.php
index ec71127f..8bc65001 100644
--- a/model/AliasHandler.php
+++ b/model/AliasHandler.php
@@ -30,7 +30,7 @@ class AliasHandler extends PFAHandler {
             'localpart'     => pacol(   $this->new, 0,      0,      'text', 'alias'                         , 'pCreate_alias_catchall_text'     , '', 
                 /*options*/ '', 
                 /*not_in_db*/ 1                         ),
-            'domain'        => pacol(   $this->new, 0,      0,      'enum', ''                              , ''                                , '', 
+            'domain'        => pacol(   $this->new, 0,      1,      'enum', ''                              , ''                                , '', 
                 /*options*/ $this->allowed_domains      ),
             'goto'          => pacol(   1,          1,      1,      'txtl', 'to'                            , 'pEdit_alias_help'                , array() ),
             'is_mailbox'    => pacol(   0,          0,      1,      'int', ''                             , ''                                , 0 ,
diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php
index 2cce7521..7d3b5708 100644
--- a/model/MailboxHandler.php
+++ b/model/MailboxHandler.php
@@ -17,7 +17,7 @@ class MailboxHandler extends PFAHandler {
             #                           editing?    form    list
             'username'      => pacol(   $this->new, 1,      1,      'mail', 'pEdit_mailbox_username'        , ''                                , '' ),
             'local_part'    => pacol(   $this->new, 0,      0,      'text', 'pEdit_mailbox_username'        , ''                                , '' ),
-            'domain'        => pacol(   $this->new, 0,      0,      'enum', ''                              , ''                                , '', 
+            'domain'        => pacol(   $this->new, 0,      1,      'enum', ''                              , ''                                , '', 
                 /*options*/ $this->allowed_domains      ),
             # TODO: maildir: display in list is needed to include maildir in SQL result (for post_edit hook)
             # TODO:          (not a perfect solution, but works for now - maybe we need a separate "include in SELECT query" field?)
@@ -265,7 +265,8 @@ class MailboxHandler extends PFAHandler {
             } else {
                 $oldvalues = $old_mh->result();
 
-                $maildir = $oldvalues['maildir'];
+                $this->values['maildir'] = $oldvalues['maildir'];
+
                 if (isset($this->values['quota'])) {
                     $quota = $this->values['quota'];
                 } else {
@@ -463,6 +464,8 @@ class MailboxHandler extends PFAHandler {
             return true; # enforcing domain_quota is disabled - just allow it
         } elseif ($limit['quota'] <= 0) { # TODO: CHECK - 0 (unlimited) is fine, not sure about <= -1 (disabled)...
             $rval = true;
+        } elseif ($quota == 0) { # trying to create an unlimited mailbox, but domain quota is set
+            return false;
         } else {
             $table_mailbox = table_by_key('mailbox');
             $query = "SELECT SUM(quota) FROM $table_mailbox WHERE domain = '" . escape_string($domain) . "'";