diff --git a/api/geth_backend.go b/api/geth_backend.go
index 5d53cdae1..369e4d591 100644
--- a/api/geth_backend.go
+++ b/api/geth_backend.go
@@ -1109,9 +1109,9 @@ func (b *GethStatusBackend) SelectAccount(loginParams account.LoginParams) error
 }
 
 func (b *GethStatusBackend) GetActiveAccount() (*multiaccounts.Account, error) {
-	if b.account == nil {
-		return nil, errors.New("master key account is nil in the GetStatusBackend")
-	}
+	/*if b.account == nil {
+		return nil, errors.New("master key account is nil in the GethStatusBackend")
+	}*/
 
 	return b.account, nil
 }
diff --git a/services/status/api.go b/services/status/api.go
index 4724502de..467390957 100644
--- a/services/status/api.go
+++ b/services/status/api.go
@@ -72,7 +72,7 @@ type SignupResponse struct {
 
 // Signup is an implementation of `status_signup` or `web3.status.signup` API
 func (api *PublicAPI) Signup(context context.Context, req SignupRequest) (res SignupResponse, err error) {
-	accountInfo, mnemonic, err := api.s.am.CreateAccount(req.Password)
+	_, accountInfo, mnemonic, err := api.s.am.CreateAccount(req.Password)
 	if err != nil {
 		err = errors.New("could not create the specified account : " + err.Error())
 		return
diff --git a/services/status/service.go b/services/status/service.go
index c8aa85204..0b15caf85 100644
--- a/services/status/service.go
+++ b/services/status/service.go
@@ -8,6 +8,7 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/status-im/status-go/account"
+	"github.com/status-im/status-go/account/generator"
 	"github.com/status-im/status-go/eth-node/types"
 )
 
@@ -23,7 +24,7 @@ type WhisperService interface {
 type AccountManager interface {
 	AddressToDecryptedAccount(string, string) (types.Account, *types.Key, error)
 	SelectAccount(account.LoginParams) error
-	CreateAccount(password string) (accountInfo account.Info, mnemonic string, err error)
+	CreateAccount(password string) (mkInfo generator.IdentifiedAccountInfo, accountInfo account.Info, mnemonic string, err error)
 }
 
 // Service represents our own implementation of status status operations.