diff --git a/model/User.py b/model/User.py
index f97d0be..cd0d8f2 100644
--- a/model/User.py
+++ b/model/User.py
@@ -485,6 +485,7 @@ class User( Persistent ):
     d = Persistent.to_dict( self )
     d.update( dict(
       username = self.username,
+      email_address = self.__email_address,
       storage_bytes = self.__storage_bytes,
       group_storage_bytes = self.__group_storage_bytes,
       rate_plan = self.__rate_plan,
diff --git a/model/test/Test_user.py b/model/test/Test_user.py
index 618b07d..4754ad9 100644
--- a/model/test/Test_user.py
+++ b/model/test/Test_user.py
@@ -99,6 +99,7 @@ class Test_user( object ):
     d = self.user.to_dict()
 
     assert d.get( "username" ) == self.username
+    assert d.get( "email_address" ) == self.email_address
     assert d.get( "storage_bytes" ) == self.user.storage_bytes
     assert d.get( "group_storage_bytes" ) == self.user.group_storage_bytes
     assert d.get( "rate_plan" ) == self.user.rate_plan