diff --git a/server/channels/app/slashcommands/auto_teams.go b/server/channels/app/slashcommands/auto_teams.go
index be6386b910..064266d3dc 100644
--- a/server/channels/app/slashcommands/auto_teams.go
+++ b/server/channels/app/slashcommands/auto_teams.go
@@ -43,12 +43,12 @@ func (cfg *AutoTeamCreator) createRandomTeam() (*model.Team, error) {
 	var teamEmail string
 	var teamDisplayName string
 	var teamName string
+
+	teamEmail = "success+" + model.NewId() + "simulator.amazonses.com"
 	if cfg.Fuzzy {
-		teamEmail = "success+" + model.NewId() + "simulator.amazonses.com"
 		teamDisplayName = utils.FuzzName()
 		teamName = model.NewRandomTeamName()
 	} else {
-		teamEmail = "success+" + model.NewId() + "simulator.amazonses.com"
 		teamDisplayName = utils.RandomName(cfg.NameLength, cfg.NameCharset)
 		teamName = utils.RandomName(cfg.NameLength, cfg.NameCharset) + model.NewId()
 	}