diff --git a/bindings/e2e.go b/bindings/e2e.go
index 289de4218cad4a4fd485b3524826e0f702e05f3c..00509dad9dfaaba1e4c383c39c6d3d141a0791ae 100644
--- a/bindings/e2e.go
+++ b/bindings/e2e.go
@@ -62,6 +62,7 @@ func LoginE2e(cmixId int, callbacks AuthCallbacks, identity []byte) (*E2e, error
 	if err != nil {
 		return nil, err
 	}
+
 	return e2eTrackerSingleton.make(newE2e), nil
 }
 
diff --git a/xxdk/e2e.go b/xxdk/e2e.go
index 055f18cfe01ea95a49a548d9530a377f52a10782..f11a49d9dbf956ffb4b75764129544f32fbeeea4 100644
--- a/xxdk/e2e.go
+++ b/xxdk/e2e.go
@@ -168,8 +168,6 @@ func LoginWithProtoClient(storageDir string, password []byte,
 		return nil, err
 	}
 
-	c.network.AddIdentity(c.GetUser().ReceptionID, time.Time{}, true)
-
 	// FIXME: The callbacks need to be set, so I suppose we would need to
 	//        either set them via a special type or add them
 	//        to the login call?
@@ -203,6 +201,9 @@ func login(client *Cmix, callbacks auth.Callbacks,
 			identity.ID.String())
 	}
 
+	// Add the identity to tracking
+	client.network.AddIdentity(identity.ID, time.Time{}, true)
+
 	e2eGrp := client.GetStorage().GetE2EGroup()
 	m = &E2e{
 		Cmix:        client,