git » chasquid » commit 498bb29

diff --git a/internal/config/config.go b/internal/config/config.go
index e815d03..dfa8a79 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -62,6 +62,14 @@ func Load(path string) (*Config, error) {
 		c.DataDir = "/var/lib/chasquid"
 	}
 
+	if c.SuffixSeparators == "" {
+		c.SuffixSeparators = "+"
+	}
+
+	if c.DropCharacters == "" {
+		c.DropCharacters = "."
+	}
+
 	return c, nil
 }
 
diff --git a/internal/config/config.proto b/internal/config/config.proto
index b57e335..601302a 100644
--- a/internal/config/config.proto
+++ b/internal/config/config.proto
@@ -49,13 +49,15 @@ message Config {
 	// Suffix separator, to perform suffix removal of local users.
 	// For example, if you set this to "-+", email to local user
 	// "user-blah" and "user+blah" will be delivered to "user".
-	// Default: none.
+	// Including "+" is strongly encouraged, as it is assumed for email
+	// forwarding.
+	// Default: "+".
 	string suffix_separators = 9;
 
 	// Characters to drop from the user part on local emails.
 	// For example, if you set this to "._", email to local user
 	// "u.se_r" will be delivered to "user".
-	// Default: none.
+	// Default: ".".
 	string drop_characters = 10;
 }