diff -r d296a020f440 -r 9823548b2717 pgsql/create_optional_types_and_functions.pgsql
--- a/pgsql/create_optional_types_and_functions.pgsql	Wed Oct 26 23:32:58 2011 +0000
+++ b/pgsql/create_optional_types_and_functions.pgsql	Fri Oct 28 15:51:31 2011 +0000
@@ -288,7 +288,7 @@
     mail        text
 );
 -- ---
--- Data type for function dovecotquotauser(varchar, varchar) 
+-- Data type for function dovecotquotauser(varchar, varchar)
 -- ---
 CREATE TYPE dovecotquotauser AS (
     userid      varchar(320),
@@ -410,11 +410,12 @@
     BEGIN
         FOR record IN
             SELECT userid, passwd, smtp, pop3, imap, managesieve
-              FROM users
+              FROM users, service_set
              WHERE gid = (SELECT gid
                             FROM domain_name
                            WHERE domainname = the_domain)
                AND local_part = localpart
+               AND service_set.ssid = users.ssid
             LOOP
                 RETURN NEXT record;
             END LOOP;