diff --git a/core/api/endpoint/label_endpoint.go b/core/api/endpoint/label_endpoint.go
index 54b94db6..9c5c75e4 100644
--- a/core/api/endpoint/label_endpoint.go
+++ b/core/api/endpoint/label_endpoint.go
@@ -685,6 +685,8 @@ func AcceptSharedFolder(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	p.Context.UserID = user.RefID
+
 	salt := util.GenerateSalt()
 
 	log.IfErr(p.UpdateUserPassword(user.RefID, salt, util.GeneratePassword(model.Password, salt)))
diff --git a/core/api/endpoint/user_endpoint.go b/core/api/endpoint/user_endpoint.go
index 0a18d7f3..ff8f8593 100644
--- a/core/api/endpoint/user_endpoint.go
+++ b/core/api/endpoint/user_endpoint.go
@@ -147,12 +147,12 @@ func AddUser(w http.ResponseWriter, r *http.Request) {
 	// set up user account for the org
 	if addAccount {
 		var a entity.Account
+		a.RefID = util.UniqueID()
 		a.UserID = userID
 		a.OrgID = p.Context.OrgID
 		a.Editor = true
 		a.Admin = false
-		accountID := util.UniqueID()
-		a.RefID = accountID
+		a.Active = true
 
 		err = p.AddAccount(a)