diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go
index 8bb5851e2..0b5930549 100644
--- a/services/socketwrap/clientManager.go
+++ b/services/socketwrap/clientManager.go
@@ -54,6 +54,9 @@ func (h *ClientsManager) Run() {
 				message.ActUser.Email = ""
 				message.ActUser.Passwd = ""
 				message.ActUser.PasswdHashAlgo = ""
+				message.ActUser.PrivateKey = ""
+				message.ActUser.PublicKey = ""
+				message.ActUser.Salt = ""
 				LastActionsQueue.Push(message)
 				for _, client := range h.Clients.Keys() {
 					select {
@@ -98,6 +101,12 @@ func initActionQueue() {
 			user, err := models.GetUserByID(actions[i].UserID)
 			if err == nil {
 				if !user.IsOrganization() {
+					actions[i].ActUser.Email = ""
+					actions[i].ActUser.Passwd = ""
+					actions[i].ActUser.PasswdHashAlgo = ""
+					actions[i].ActUser.PrivateKey = ""
+					actions[i].ActUser.PublicKey = ""
+					actions[i].ActUser.Salt = ""
 					LastActionsQueue.Push(actions[i])
 				}