diff --git a/cmd/lotus-storage-miner/init.go b/cmd/lotus-storage-miner/init.go
index ef9bdbfdf18..4254924cd73 100644
--- a/cmd/lotus-storage-miner/init.go
+++ b/cmd/lotus-storage-miner/init.go
@@ -28,6 +28,21 @@ var initCmd = &cli.Command{
 		&cli.BoolFlag{
 			Name:  "genesis-miner",
 			Usage: "enable genesis mining (DON'T USE ON BOOTSTRAPPED NETWORK)",
+			Hidden: true,
+		},
+		&cli.BoolFlag{
+			Name:  "create-worker-key",
+			Usage: "create separate worker key",
+		},
+		&cli.StringFlag{
+			Name:  "worker",
+			Aliases: []string{"w"},
+			Usage: "worker key to use (overrides --create-worker-key)",
+		},
+		&cli.StringFlag{
+			Name:  "owner",
+			Aliases: []string{"o"},
+			Usage: "owner key to use",
 		},
 	},
 	Action: func(cctx *cli.Context) error {
@@ -103,7 +118,7 @@ var initCmd = &cli.Command{
 
 			addr = a
 		} else {
-			a, err := createStorageMiner(ctx, api, peerid)
+			a, err := createStorageMiner(ctx, api, peerid, cctx)
 			if err != nil {
 				return err
 			}
@@ -194,15 +209,26 @@ func configureStorageMiner(ctx context.Context, api api.FullNode, addr address.A
 	return nil
 }
 
-func createStorageMiner(ctx context.Context, api api.FullNode, peerid peer.ID) (address.Address, error) {
+func createStorageMiner(ctx context.Context, api api.FullNode, peerid peer.ID, cctx *cli.Context) (addr address.Address, err error) {
 	log.Info("Creating StorageMarket.CreateStorageMiner message")
 
-	defOwner, err := api.WalletDefaultAddress(ctx)
+	var owner address.Address
+	if cctx.String("owner") != "" {
+		owner, err = address.NewFromString(cctx.String("owner"))
+	} else {
+		owner, err = api.WalletDefaultAddress(ctx)
+	}
 	if err != nil {
 		return address.Undef, err
 	}
 
-	k, err := api.WalletNew(ctx, types.KTBLS)
+	worker := owner
+	if cctx.String("worker") != "" {
+		worker, err = address.NewFromString(cctx.String("worker"))
+	} else if cctx.Bool("create-worker-key") { // TODO: Do we need to force this if owner is Secpk?
+		worker, err = api.WalletNew(ctx, types.KTBLS)
+	}
+	// TODO: Transfer some initial funds to worker
 	if err != nil {
 		return address.Undef, err
 	}
@@ -210,8 +236,8 @@ func createStorageMiner(ctx context.Context, api api.FullNode, peerid peer.ID) (
 	collateral := types.NewInt(1000) // TODO: Get this from params
 
 	params, err := actors.SerializeParams(&actors.CreateStorageMinerParams{
-		Owner:      defOwner,
-		Worker:     k,
+		Owner:      owner,
+		Worker:     worker,
 		SectorSize: types.NewInt(build.SectorSize),
 		PeerID:     peerid,
 	})
@@ -221,7 +247,7 @@ func createStorageMiner(ctx context.Context, api api.FullNode, peerid peer.ID) (
 
 	createStorageMinerMsg := &types.Message{
 		To:    actors.StorageMarketAddress,
-		From:  defOwner,
+		From:  owner,
 		Value: collateral,
 
 		Method: actors.SMAMethods.CreateStorageMiner,
@@ -244,7 +270,7 @@ func createStorageMiner(ctx context.Context, api api.FullNode, peerid peer.ID) (
 		return address.Undef, err
 	}
 
-	addr, err := address.NewFromBytes(mw.Receipt.Return)
+	addr, err = address.NewFromBytes(mw.Receipt.Return)
 	if err != nil {
 		return address.Undef, err
 	}