diff --git a/yowsup/layers/protocol_contacts/protocolentities/notification_contact_add.py b/yowsup/layers/protocol_contacts/protocolentities/notification_contact_add.py
index 9ee6496f9..f0b64177e 100644
--- a/yowsup/layers/protocol_contacts/protocolentities/notification_contact_add.py
+++ b/yowsup/layers/protocol_contacts/protocolentities/notification_contact_add.py
@@ -4,7 +4,7 @@ class AddContactNotificationProtocolEntity(ContactNotificationProtocolEntity):
     '''
     <notification offline="0" id="{{NOTIFICATION_ID}}" notify="{{NOTIFY_NAME}}" type="contacts" 
             t="{{TIMESTAMP}}" from="{{SENDER_JID}}">
-        <add jid="{{SET_JID}}"> </add>
+        <add>{{NUMBER}}"</add>
     </notification>
     '''
 
@@ -14,6 +14,8 @@ def __init__(self, _id,  _from, timestamp, notify, offline, contactJid):
 
     def setData(self, jid):
         self.contactJid = jid
+        if self.contactJid.find('@') >= 0:
+            self.contactJid += '@s.whatsapp.net'
 
     def toProtocolTreeNode(self):
         node = super(AddContactNotificationProtocolEntity, self).toProtocolTreeNode()
@@ -26,5 +28,5 @@ def fromProtocolTreeNode(node):
         entity = ContactNotificationProtocolEntity.fromProtocolTreeNode(node)
         entity.__class__ = AddContactNotificationProtocolEntity
         removeNode = node.getChild("add")
-        entity.setData(removeNode.getAttributeValue("jid"))
-        return entity
\ No newline at end of file
+        entity.setData(removeNode.getData())
+        return entity