diff -r d296a020f440 -r 9823548b2717 pgsql/update_types_and_functions_0.5.x-0.6.pgsql
--- a/pgsql/update_types_and_functions_0.5.x-0.6.pgsql	Wed Oct 26 23:32:58 2011 +0000
+++ b/pgsql/update_types_and_functions_0.5.x-0.6.pgsql	Fri Oct 28 15:51:31 2011 +0000
@@ -70,11 +70,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;