From 186b6cb99eed7dcfb7e85183c40b4be9ecf7a121 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Fri, 12 Mar 2021 14:47:02 +0100
Subject: [PATCH] Update user's meta only when not nil

---
 system/service/user.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/service/user.go b/system/service/user.go
index a76a2051b..2581f8d80 100644
--- a/system/service/user.go
+++ b/system/service/user.go
@@ -429,9 +429,13 @@ func (svc user) Update(ctx context.Context, upd *types.User) (u *types.User, err
 		u.Name = upd.Name
 		u.Handle = upd.Handle
 		u.Kind = upd.Kind
-		u.Meta = upd.Meta
 		u.UpdatedAt = now()
 
+		if upd.Meta != nil {
+			// Only update meta when set
+			u.Meta = upd.Meta
+		}
+
 		if err = svc.eventbus.WaitFor(ctx, event.UserBeforeUpdate(upd, u)); err != nil {
 			return
 		}