diff --git a/pkg/store/store_test.go b/pkg/store/store_test.go
index 093d5fb..9e65052 100644
--- a/pkg/store/store_test.go
+++ b/pkg/store/store_test.go
@@ -216,6 +216,7 @@ func (mocks *mocksForStore) newStoreNoEvents(t *testing.T, combinedMode bool, ms
 		message.NewBuilder(runtime.NumCPU(), runtime.NumCPU()),
 		filepath.Join(mocks.tmpDir, "mailbox-test.db"),
 		mocks.cache,
+		mocks.user.IsConnected(),
 	)
 	require.NoError(mocks.tb, err)
 
diff --git a/pkg/users/mocks/mocks.go b/pkg/users/mocks/mocks.go
index c2beadd..c2b2ebf 100644
--- a/pkg/users/mocks/mocks.go
+++ b/pkg/users/mocks/mocks.go
@@ -230,18 +230,18 @@ func (m *MockStoreMaker) EXPECT() *MockStoreMakerMockRecorder {
 }
 
 // New mocks base method.
-func (m *MockStoreMaker) New(arg0 store.BridgeUser) (*store.Store, error) {
+func (m *MockStoreMaker) New(arg0 store.BridgeUser, arg1 bool) (*store.Store, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "New", arg0)
+	ret := m.ctrl.Call(m, "New", arg0, arg1)
 	ret0, _ := ret[0].(*store.Store)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // New indicates an expected call of New.
-func (mr *MockStoreMakerMockRecorder) New(arg0 interface{}) *gomock.Call {
+func (mr *MockStoreMakerMockRecorder) New(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockStoreMaker)(nil).New), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockStoreMaker)(nil).New), arg0, arg1)
 }
 
 // Remove mocks base method.
diff --git a/pkg/users/user_credentials_test.go b/pkg/users/user_credentials_test.go
index 1bff673..c6578d6 100644
--- a/pkg/users/user_credentials_test.go
+++ b/pkg/users/user_credentials_test.go
@@ -152,10 +152,10 @@ func TestCheckBridgeLoginLoggedOut(t *testing.T) {
 		m.pmapiClient.EXPECT().Addresses().Return(nil),
 	)
 
-	user, _, err := newUser("user", m.eventListener, m.credentialsStore, m.storeMaker)
+	user, err := newUser("user", m.eventListener, m.credentialsStore, m.storeMaker, m.clientManager)
 	r.NoError(t, err)
 
-	err = user.connect(m.pmapiClient, testCredentialsDisconnected)
+	err = user.connect(m.pmapiClient)
 	r.Error(t, err)
 	defer cleanUpUserData(user)
 
diff --git a/pkg/users/user_new_test.go b/pkg/users/user_new_test.go
index 9bbf3bf..65ba8d9 100644
--- a/pkg/users/user_new_test.go
+++ b/pkg/users/user_new_test.go
@@ -34,7 +34,7 @@ func TestNewUserNoCredentialsStore(t *testing.T) {
 
 	m.credentialsStore.EXPECT().Get("user").Return(nil, errors.New("fail"))
 
-	_, _, err := newUser("user", m.eventListener, m.credentialsStore, m.storeMaker)
+	_, err := newUser("user", m.eventListener, m.credentialsStore, m.storeMaker, m.clientManager)
 	r.Error(t, err)
 }
 
@@ -70,11 +70,11 @@ func TestNewUser(t *testing.T) {
 }
 
 func checkNewUserHasCredentials(m mocks, wantErr string, wantCreds *credentials.Credentials) {
-	user, _, err := newUser("user", m.eventListener, m.credentialsStore, m.storeMaker)
+	user, err := newUser("user", m.eventListener, m.credentialsStore, m.storeMaker, m.clientManager)
 	r.NoError(m.t, err)
 	defer cleanUpUserData(user)
 
-	err = user.connect(m.pmapiClient, testCredentials)
+	err = user.connect(m.pmapiClient)
 	if wantErr == "" {
 		r.NoError(m.t, err)
 	} else {
diff --git a/pkg/users/user_test.go b/pkg/users/user_test.go
index fcf8e21..acbddcf 100644
--- a/pkg/users/user_test.go
+++ b/pkg/users/user_test.go
@@ -29,10 +29,10 @@ func testNewUser(t *testing.T, m mocks) *User {
 	mockInitConnectedUser(t, m)
 	mockEventLoopNoAction(m)
 
-	user, creds, err := newUser("user", m.eventListener, m.credentialsStore, m.storeMaker)
+	user, err := newUser("user", m.eventListener, m.credentialsStore, m.storeMaker, m.clientManager)
 	r.NoError(m.t, err)
 
-	err = user.connect(m.pmapiClient, creds)
+	err = user.connect(m.pmapiClient)
 	r.NoError(m.t, err)
 
 	return user
diff --git a/pkg/users/users_login_test.go b/pkg/users/users_login_test.go
index 63d419e..8d48d3e 100644
--- a/pkg/users/users_login_test.go
+++ b/pkg/users/users_login_test.go
@@ -112,6 +112,9 @@ func checkUsersFinishLogin(t *testing.T, m mocks, auth *pmapi.Auth, mailboxPassw
 	defer cleanUpUsersData(users)
 
 	user, err := users.FinishLogin(m.pmapiClient, auth, mailboxPassword)
+	if user != nil {
+		user.connect(m.pmapiClient)
+	}
 
 	r.Equal(t, expectedErr, err)
 
diff --git a/pkg/users/users_test.go b/pkg/users/users_test.go
index d5e313f..17ff686 100644
--- a/pkg/users/users_test.go
+++ b/pkg/users/users_test.go
@@ -188,7 +188,7 @@ func initMocks(t *testing.T) mocks {
 	}
 
 	// Set up store factory.
-	m.storeMaker.EXPECT().New(gomock.Any()).DoAndReturn(func(user store.BridgeUser) (*store.Store, error) {
+	m.storeMaker.EXPECT().New(gomock.Any(), gomock.Any()).DoAndReturn(func(user store.BridgeUser, connected bool) (*store.Store, error) {
 		dbFile, err := ioutil.TempFile(t.TempDir(), "bridge-store-db-*.db")
 		r.NoError(t, err, "could not get temporary file for store db")
 		r.NoError(t, dbFile.Close())
@@ -200,6 +200,7 @@ func initMocks(t *testing.T) mocks {
 			message.NewBuilder(runtime.NumCPU(), runtime.NumCPU()),
 			dbFile.Name(),
 			m.storeCache,
+			connected,
 		)
 	}).AnyTimes()
 	m.storeMaker.EXPECT().Remove(gomock.Any()).AnyTimes()
@@ -232,6 +233,9 @@ func testNewUsersWithUsers(t *testing.T, m mocks) *Users {
 
 func testNewUsers(t *testing.T, m mocks) *Users { //nolint[unparam]
 	users := New(m.eventListener, m.clientManager, m.credentialsStore, m.storeMaker)
+	for _, user := range users.users {
+		user.BringOnline("foo", "bar")
+	}
 
 	waitForEvents()