diff --git a/server/hooks.go b/server/hooks.go
index cb022a8c5..c1f2ee23e 100644
--- a/server/hooks.go
+++ b/server/hooks.go
@@ -18,10 +18,13 @@ func (p *Plugin) UserHasJoinedTeam(c *plugin.Context, teamMember *model.TeamMemb
 	}
 
 	for _, message := range p.getWelcomeMessages() {
-		if message.TeamName == data.Team.Name {
+		switch message.TeamName {
+		case data.Team.Name:
 			go p.processWelcomeMessage(*data, *message)
-		} else if message.TeamName == "*" {
+		case "*":
 			go p.processWelcomeMessage(*data, *message)
+		default:
+			p.API.LogError("Couldn't find the message for the team")
 		}
 	}
 }
diff --git a/server/welcomebot.go b/server/welcomebot.go
index 309395565..6deb0eadd 100644
--- a/server/welcomebot.go
+++ b/server/welcomebot.go
@@ -66,7 +66,7 @@ func (p *Plugin) newSampleMessageTemplate(teamName, userID string) (*MessageTemp
 		return nil, fmt.Errorf("failed to query user %s: %w", userID, err)
 	}
 
-	if data.Team, err = p.API.GetTeamByName(strings.ToLower(teamName)); err != nil {
+	if data.Team, err = p.API.GetTeamByName(teamName); err != nil {
 		p.API.LogError("failed to query team", "team_name", teamName, "err", err)
 		return nil, fmt.Errorf("failed to query team %s: %w", teamName, err)
 	}