diff --git a/server/welcomebot.go b/server/welcomebot.go
index 6deb0eadd..172ace265 100644
--- a/server/welcomebot.go
+++ b/server/welcomebot.go
@@ -57,7 +57,7 @@ func (p *Plugin) getSiteURL() string {
 	return *config.ServiceSettings.SiteURL
 }
 
-func (p *Plugin) newSampleMessageTemplate(teamName, userID string) (*MessageTemplate, error) {
+func (p *Plugin) newSampleMessageTemplate(teamName string, userID string) (*MessageTemplate, error) {
 	data := &MessageTemplate{}
 	var err *model.AppError
 
@@ -66,14 +66,14 @@ 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(teamName); err != nil {
+	if data.Team, err = p.API.GetTeamByName(strings.ToLower(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)
 	}
 
 	if data.Townsquare, err = p.API.GetChannelByName(data.Team.Id, "town-square", false); err != nil {
-		p.API.LogError("failed to query town-square", "team_name", teamName)
-		return nil, fmt.Errorf("failed to query town-square %s: %w", teamName, err)
+		p.API.LogError("failed to query town-square", "team_name", data.Team.Name)
+		return nil, fmt.Errorf("failed to query town-square %s: %w", data.Team.Name, err)
 	}
 
 	if data.DirectMessage, err = p.API.GetDirectChannel(data.User.Id, p.botUserID); err != nil {