diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go
index 532a1e095c..b9a77cfc58 100644
--- a/cmd/gaia/app/app.go
+++ b/cmd/gaia/app/app.go
@@ -58,8 +58,14 @@ func NewGaiaApp(logger log.Logger, db dbm.DB) *GaiaApp {
 		keyStake:   sdk.NewKVStoreKey("stake"),
 	}
 
-	// add accountMapper/handlers
-	app.accountMapper = auth.NewAccountMapper(app.cdc, app.keyMain, &auth.BaseAccount{})
+	// define the accountMapper
+	app.accountMapper = auth.NewAccountMapper(
+		app.cdc,
+		app.keyAccount,      // target store
+		&auth.BaseAccount{}, // prototype
+	)
+
+	// add handlers
 	app.coinKeeper = bank.NewKeeper(app.accountMapper)
 	app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace))
 	app.stakeKeeper = stake.NewKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace))
diff --git a/examples/democoin/app/app.go b/examples/democoin/app/app.go
index 5f2cd32d80..f7da19f722 100644
--- a/examples/democoin/app/app.go
+++ b/examples/democoin/app/app.go
@@ -66,8 +66,8 @@ func NewDemocoinApp(logger log.Logger, db dbm.DB) *DemocoinApp {
 	// Define the accountMapper.
 	app.accountMapper = auth.NewAccountMapper(
 		cdc,
-		app.capKeyMainStore, // target store
-		&types.AppAccount{}, // prototype
+		app.capKeyAccountStore, // target store
+		&types.AppAccount{},    // prototype
 	)
 
 	// Add handlers.