diff --git a/models/user/user.go b/models/user/user.go
index 5a8c1e9d73..7544e24be6 100644
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -562,7 +562,7 @@ func GetUserSalt() string {
 // Note: The set of characters here can safely expand without a breaking change,
 // but characters removed from this set can cause user account linking to break
 var (
-	customCharsReplacement    = strings.NewReplacer("Æ", "AE")
+	customCharsReplacement    = strings.NewReplacer("Æ", "AE", "ß", "ss")
 	removeCharsRE             = regexp.MustCompile(`['´\x60]`)
 	removeDiacriticsTransform = transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC)
 	replaceCharsHyphenRE      = regexp.MustCompile(`[\s~+]`)
diff --git a/models/user/user_test.go b/models/user/user_test.go
index 139d6b8a47..7263f9510c 100644
--- a/models/user/user_test.go
+++ b/models/user/user_test.go
@@ -645,6 +645,7 @@ func Test_NormalizeUserFromEmail(t *testing.T) {
 		{"test", "test", true},
 		{"Sinéad.O'Connor", "Sinead.OConnor", true},
 		{"Æsir", "AEsir", true},
+		{"Flußpferd", "Flusspferd", true},
 		// \u00e9\u0065\u0301
 		{"éé", "ee", true},
 		{"Awareness Hub", "Awareness-Hub", true},