diff --git a/xxdk/e2e.go b/xxdk/e2e.go
index 0a58b8af5b7f6a007c7b717e11ad0e57fb20196a..157f0e6684426c276bd18144880d81958d175656 100644
--- a/xxdk/e2e.go
+++ b/xxdk/e2e.go
@@ -164,8 +164,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?
@@ -206,6 +204,8 @@ func login(client *Cmix, callbacks auth.Callbacks,
 		e2eIdentity: identity,
 	}
 
+	client.network.AddIdentity(identity.ID, time.Time{}, true)
+
 	//initialize the e2e storage
 	err = e2e.Init(kv, identity.ID, identity.DHKeyPrivate, e2eGrp,
 		rekey.GetDefaultEphemeralParams())