1 files changed, 9 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index a42b608b2..f4186d352 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -165,12 +165,21 @@ func LoadConfig(fileName string) {
 		CfgFileName = fileName
 	}
 
+	needSave := len(config.SqlSettings.AtRestEncryptKey) == 0 || len(*config.FileSettings.PublicLinkSalt) == 0 ||
+		len(config.EmailSettings.InviteSalt) == 0 || len(config.EmailSettings.PasswordResetSalt) == 0
+
 	config.SetDefaults()
 
 	if err := config.IsValid(); err != nil {
 		panic(T(err.Id))
 	}
 
+	if needSave {
+		if err := SaveConfig(fileName, &config); err != nil {
+			l4g.Warn(T(err.Id))
+		}
+	}
+
 	if err := ValidateLdapFilter(&config); err != nil {
 		panic(T(err.Id))
 	}