diff --git a/cmd/admin.go b/cmd/admin.go
index 6c79141ea..7a519395b 100644
--- a/cmd/admin.go
+++ b/cmd/admin.go
@@ -73,6 +73,11 @@ var (
 				Value: "",
 				Usage: "New password to set for user",
 			},
+			cli.StringFlag{
+				Name:  "config, c",
+				Value: "custom/conf/app.ini",
+				Usage: "Custom configuration file path",
+			},
 		},
 	}
 
@@ -122,6 +127,10 @@ func runChangePassword(c *cli.Context) error {
 	if err := argsSet(c, "username", "password"); err != nil {
 		return err
 	}
+	
+	if c.IsSet("config") {
+		setting.CustomConf = c.String("config")
+	}
 
 	if err := initDB(); err != nil {
 		return err