diff --git a/app/models/person.rb b/app/models/person.rb
index b9fd85cc0..3edb350a2 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -23,6 +23,7 @@ class Person
   include MongoMapper::Document
   include ROXML
   include Encryptor::Public
+  include Diaspora::Socketable
 
   xml_accessor :_id
   xml_accessor :email
diff --git a/app/models/user.rb b/app/models/user.rb
index cefa4e4d4..c798a50eb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -263,6 +263,8 @@ class User
       person = Diaspora::Parser.owner_id_from_xml xml
       person.profile = object
       person.save  
+      
+      object.socket_to_uid(id, :aspect_ids => aspect_ids) if object.respond_to?(:socket_to_uid)
 
     elsif object.is_a?(Comment) 
       object.person = Diaspora::Parser.parse_or_find_person_from_xml( xml ).save if object.person.nil?