diff --git a/storage/session.go b/storage/session.go
index daf1d8eff0845f82e7b3f053e1234293929100be..45c4d95f06b3566edb609550ee3cafddcf84bba5 100644
--- a/storage/session.go
+++ b/storage/session.go
@@ -121,7 +121,7 @@ func New(baseDir, password string, u user.Info,
 	}
 
 	s.User, err = user.NewUser(s.kv, u.TransmissionID, u.ReceptionID, u.TransmissionSalt,
-		u.ReceptionSalt, u.TransmissionRSA, u.ReceptionRSA, u.Precanned, u.E2eDhPublicKey, u.E2eDhPublicKey)
+		u.ReceptionSalt, u.TransmissionRSA, u.ReceptionRSA, u.Precanned, u.E2eDhPrivateKey, u.E2eDhPublicKey)
 	if err != nil {
 		return nil, errors.WithMessage(err, "Failed to create user")
 	}
diff --git a/xxdk/user.go b/xxdk/user.go
index f2a5520ae33cb591c9efba221d292f48d900a3bd..b97feda591fd078475a398fd04c43036ee989e3a 100644
--- a/xxdk/user.go
+++ b/xxdk/user.go
@@ -186,7 +186,7 @@ func createNewVanityUser(rng csprng.Source,
 			for {
 				select {
 				case <-done:
-					defer wg.Done()
+					wg.Done()
 					return
 				default:
 					n, err = csprng.NewSystemRNG().Read(