7 files changed, 8 insertions, 5 deletions
diff --git a/Mailman/database/model/__init__.py b/Mailman/database/model/__init__.py
index 612510632..82e66eb0b 100644
--- a/Mailman/database/model/__init__.py
+++ b/Mailman/database/model/__init__.py
@@ -43,7 +43,7 @@ from Mailman.database.model.address import Address
 from Mailman.database.model.language import Language
 from Mailman.database.model.mailinglist import MailingList
 from Mailman.database.model.member import Member
-from Mailman.database.model.profile import Preferences
+from Mailman.database.model.preferences import Preferences
 from Mailman.database.model.user import User
 from Mailman.database.model.version import Version
 
diff --git a/Mailman/database/model/address.py b/Mailman/database/model/address.py
index 7500197a8..897b41696 100644
--- a/Mailman/database/model/address.py
+++ b/Mailman/database/model/address.py
@@ -22,7 +22,7 @@ from zope.interface import implements
 from Mailman.interfaces import IAddress
 
 MEMBER_KIND     = 'Mailman.database.model.member.Member'
-PREFERENCE_KIND = 'Mailman.database.model.profile.Preferences'
+PREFERENCE_KIND = 'Mailman.database.model.preferences.Preferences'
 USER_KIND       = 'Mailman.database.model.user.User'
 
 
diff --git a/Mailman/database/model/member.py b/Mailman/database/model/member.py
index 89a98d327..d9562aede 100644
--- a/Mailman/database/model/member.py
+++ b/Mailman/database/model/member.py
@@ -24,7 +24,7 @@ from Mailman.interfaces import IMember, IPreferences
 
 
 ADDRESS_KIND    = 'Mailman.database.model.address.Address'
-PREFERENCE_KIND = 'Mailman.database.model.profile.Preferences'
+PREFERENCE_KIND = 'Mailman.database.model.preferences.Preferences'
 
 
 
diff --git a/Mailman/database/model/profile.py b/Mailman/database/model/preferences.py
index 33511f54b..33511f54b 100644
--- a/Mailman/database/model/profile.py
+++ b/Mailman/database/model/preferences.py
diff --git a/Mailman/database/model/user.py b/Mailman/database/model/user.py
index 9419f181d..683ec0f90 100644
--- a/Mailman/database/model/user.py
+++ b/Mailman/database/model/user.py
@@ -25,7 +25,7 @@ from Mailman.database.model import Preferences
 from Mailman.interfaces import IUser
 
 ADDRESS_KIND    = 'Mailman.database.model.address.Address'
-PREFERENCE_KIND = 'Mailman.database.model.profile.Preferences'
+PREFERENCE_KIND = 'Mailman.database.model.preferences.Preferences'
 
 
 
@@ -66,6 +66,7 @@ class User(Entity):
             if real_name is None:
                 real_name = ''
             addrobj = Address(address=address, real_name=real_name)
+            addrobj.preferences = Preferences()
         # Link the address to the user if it is not already linked.
         if addrobj.user is not None:
             raise Errors.AddressAlreadyLinkedError(addrobj)
diff --git a/Mailman/database/usermanager.py b/Mailman/database/usermanager.py
index 569ca2152..a37dcf60a 100644
--- a/Mailman/database/usermanager.py
+++ b/Mailman/database/usermanager.py
@@ -39,7 +39,9 @@ class UserManager(object):
         user = User()
         user.real_name = (real_name if real_name is not None else '')
         if address:
-            user.link(Address(address=address, real_name=user.real_name))
+            addrobj = Address(address=address, real_name=user.real_name)
+            addrobj.preferences = Preferences()
+            user.link(addrobj)
         user.preferences = Preferences()
         return user
 
diff --git a/Mailman/interfaces/profile.py b/Mailman/interfaces/preferences.py
index 17cfebae6..17cfebae6 100644
--- a/Mailman/interfaces/profile.py
+++ b/Mailman/interfaces/preferences.py