diff --git a/cmd/admin.go b/cmd/admin.go
index 893b6f5be9f..5ee20860aba 100644
--- a/cmd/admin.go
+++ b/cmd/admin.go
@@ -59,6 +59,10 @@ var (
 				Value: "custom/conf/app.ini",
 				Usage: "Custom configuration file path",
 			},
+			cli.BoolFlag{
+				Name:  "must-change-password",
+				Usage: "Force the user to change his/her password after initial login",
+			},
 		},
 	}
 
@@ -285,12 +289,20 @@ func runCreateUser(c *cli.Context) error {
 		return err
 	}
 
+	// always default to true
+	var changePassword = true
+
+	if c.IsSet("must-change-password") {
+		changePassword = c.Bool("must-change-password")
+	}
+
 	if err := models.CreateUser(&models.User{
-		Name:     c.String("name"),
-		Email:    c.String("email"),
-		Passwd:   c.String("password"),
-		IsActive: true,
-		IsAdmin:  c.Bool("admin"),
+		Name:               c.String("name"),
+		Email:              c.String("email"),
+		Passwd:             c.String("password"),
+		IsActive:           true,
+		IsAdmin:            c.Bool("admin"),
+		MustChangePassword: changePassword,
 	}); err != nil {
 		return fmt.Errorf("CreateUser: %v", err)
 	}