diff --git a/Makefile b/Makefile
index aa1644e699..491e714eae 100644
--- a/Makefile
+++ b/Makefile
@@ -290,8 +290,8 @@ test-data: start-docker ## Add test data to the local instance.
 
 	@echo You may need to restart the Mattermost server before using the following
 	@echo ========================================================================
-	@echo Login with a system admin account username=sysadmin password=sysadmin
-	@echo Login with a regular account username=user-1 password=user-1
+	@echo Login with a system admin account username=sysadmin password=Sys@dmin-sample1
+	@echo Login with a regular account username=user-1 password=SampleUs@r-1
 	@echo ========================================================================
 
 validate-go-version: ## Validates the installed version of go against Mattermost's minimum requirement.
diff --git a/cmd/mattermost/commands/sampledata.go b/cmd/mattermost/commands/sampledata.go
index 3a5c41f1a0..b46a341ed5 100644
--- a/cmd/mattermost/commands/sampledata.go
+++ b/cmd/mattermost/commands/sampledata.go
@@ -356,10 +356,10 @@ func sampleDataCmdF(command *cobra.Command, args []string) error {
 }
 
 func createUser(idx int, teamMemberships int, channelMemberships int, teamsAndChannels map[string][]string, profileImages []string, guest bool) app.LineImportData {
-	password := fmt.Sprintf("user-%d", idx)
+	password := fmt.Sprintf("SampleUs@r-%d", idx)
 	email := fmt.Sprintf("user-%d@sample.mattermost.com", idx)
 	if guest {
-		password = fmt.Sprintf("guest-%d", idx)
+		password = fmt.Sprintf("SampleGu@st-%d", idx)
 		email = fmt.Sprintf("guest-%d@sample.mattermost.com", idx)
 	}
 	firstName := fake.FirstName()
@@ -368,12 +368,12 @@ func createUser(idx int, teamMemberships int, channelMemberships int, teamsAndCh
 	if guest {
 		if idx == 0 {
 			username = "guest"
-			password = "guest"
+			password = "SampleGu@st1"
 			email = "guest@sample.mattermost.com"
 		}
 	} else if idx == 0 {
 		username = "sysadmin"
-		password = "sysadmin"
+		password = "Sys@dmin-sample1"
 		email = "sysadmin@sample.mattermost.com"
 	} else if idx == 1 {
 		username = "user-1"