diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go
index 0c2edf9b3..a79fe6456 100644
--- a/management/server/grpcserver.go
+++ b/management/server/grpcserver.go
@@ -285,9 +285,9 @@ func extractPeerMeta(loginReq *proto.LoginRequest) nbpeer.PeerSystemMeta {
 		UIVersion:          loginReq.GetMeta().GetUiVersion(),
 		KernelVersion:      loginReq.GetMeta().GetKernelVersion(),
 		NetworkAddresses:   networkAddresses,
-		SystemSerialNumber: loginReq.GetMeta().GetSysManufacturer(),
+		SystemSerialNumber: loginReq.GetMeta().GetSysSerialNumber(),
 		SystemProductName:  loginReq.GetMeta().GetSysProductName(),
-		SystemManufacturer: loginReq.GetMeta().GetSysSerialNumber(),
+		SystemManufacturer: loginReq.GetMeta().GetSysManufacturer(),
 	}
 }