Changing the user-0 data to sysadmin and user-1 username to user-1 (#8494)

2 files changed, 11 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 451581dd3..9be225b08 100644
--- a/Makefile
+++ b/Makefile
@@ -384,10 +384,10 @@ test-data: start-docker ## Add test data to the local instance.
 	$(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) $(PLATFORM_FILES) sampledata -w 1
 
 	@echo You may need to restart the Mattermost server before using the following
-	@echo ====================================================================================
-	@echo Login with a system admin account email=user-0@sample.mattermost.com password=user-0
-	@echo Login with a regular account email=user-1@sample.mattermost.com password=user-1
-	@echo ====================================================================================
+	@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 ========================================================================
 
 run-server: start-docker ## Starts the server.
 	@echo Running mattermost for development
diff --git a/cmd/commands/sampledata.go b/cmd/commands/sampledata.go
index 5377f1153..910913eef 100644
--- a/cmd/commands/sampledata.go
+++ b/cmd/commands/sampledata.go
@@ -333,6 +333,13 @@ func createUser(idx int, teamMemberships int, channelMemberships int, teamsAndCh
 	firstName := fake.FirstName()
 	lastName := fake.LastName()
 	username := fmt.Sprintf("%s.%s", strings.ToLower(firstName), strings.ToLower(lastName))
+	if idx == 0 {
+		username = "sysadmin"
+		password = "sysadmin"
+		email = "sysadmin@sample.mattermost.com"
+	} else if idx == 1 {
+		username = "user-1"
+	}
 	position := fake.JobTitle()
 	roles := "system_user"
 	if idx%5 == 0 {