diff --git a/net/web/src/api/fetchUtil.js b/net/web/src/api/fetchUtil.js
index e4eb445d..02bd85d4 100644
--- a/net/web/src/api/fetchUtil.js
+++ b/net/web/src/api/fetchUtil.js
@@ -2,6 +2,11 @@ const TIMEOUT = 15000;
 
 //await new Promise(r => setTimeout(r, 2000));
 
+export function createWebsocket(url) {
+console.log("HERE");
+  return new WebSocket(url);
+}
+
 export function checkResponse(response) {
   if(response.status >= 400 && response.status < 600) {
     throw new Error(response.url + " failed");
diff --git a/net/web/src/context/useAppContext.hook.js b/net/web/src/context/useAppContext.hook.js
index df6e8733..ac9e7d76 100644
--- a/net/web/src/context/useAppContext.hook.js
+++ b/net/web/src/context/useAppContext.hook.js
@@ -11,9 +11,11 @@ import { CardContext } from './CardContext';
 import { ChannelContext } from './ChannelContext';
 import { StoreContext } from './StoreContext';
 import { UploadContext } from './UploadContext';
+import { createWebsocket } from 'api/fetchUtil';
 
-export function useAppContext() {
+export function useAppContext(websocket) {
   const [state, setState] = useState({
+    disconnected: true,
   });
   const [appRevision, setAppRevision] = useState();
 
@@ -69,6 +71,11 @@ export function useAppContext() {
     let access = await setLogin(username, password, appName, appVersion, userAgent)
     updateState({ access: access.appToken });
     storeContext.actions.setValue('login:timestamp', access.created);
+    accountContext.actions.setToken(access.appToken);
+    profileContext.actions.setToken(access.appToken);
+    cardContext.actions.setToken(access.appToken);
+    channelContext.actions.setToken(access.appToken);
+
     setWebsocket(access.appToken)
     localStorage.setItem("session", JSON.stringify({
       access: access.appToken,
@@ -81,6 +88,11 @@ export function useAppContext() {
     let access = await setLogin(username, password, appName, appVersion, userAgent)
     updateState({ access: access.appToken });
     storeContext.actions.setValue('login:timestamp', access.created);
+    accountContext.actions.setToken(access.appToken);
+    profileContext.actions.setToken(access.appToken);
+    cardContext.actions.setToken(access.appToken);
+    channelContext.actions.setToken(access.appToken);
+
     setWebsocket(access.appToken)
     localStorage.setItem("session", JSON.stringify({
       access: access.appToken,
@@ -93,6 +105,11 @@ export function useAppContext() {
     let access = await setAccountAccess(token, appName, appVersion, userAgent)
     updateState({ access: access.appToken });
     storeContext.actions.setValue('login:timestamp', access.created);
+    accountContext.actions.setToken(access.appToken);
+    profileContext.actions.setToken(access.appToken);
+    cardContext.actions.setToken(access.appToken);
+    channelContext.actions.setToken(access.appToken);
+
     setWebsocket(access.appToken)
     localStorage.setItem("session", JSON.stringify({
       access: access.appToken,
@@ -109,6 +126,11 @@ export function useAppContext() {
       console.log(err);
     }
     updateState({ access: null });
+    accountContext.actions.clearToken();
+    profileContext.actions.clearToken();
+    cardContext.actions.clearToken();
+    channelContext.actions.clearToken();
+
     clearWebsocket()
     localStorage.removeItem("session");
   }
@@ -124,12 +146,6 @@ export function useAppContext() {
   }, [appRevision]);
   
   const setWebsocket = (token) => {
-
-    accountContext.actions.setToken(token);
-    profileContext.actions.setToken(token);
-    cardContext.actions.setToken(token);
-    channelContext.actions.setToken(token);
-
     let protocol;
     if (window.location.protocol === 'http:') {
       protocol = 'ws://';
@@ -138,7 +154,7 @@ export function useAppContext() {
       protocol = 'wss://';
     }
 
-    ws.current = new WebSocket(protocol + window.location.host + "/status");
+    ws.current = createWebsocket(protocol + window.location.host + "/status");
     ws.current.onmessage = (ev) => {
       try {
         let rev = JSON.parse(ev.data);
diff --git a/net/web/src/context/useCardContext.hook.js b/net/web/src/context/useCardContext.hook.js
index 5c4f51c3..b2975241 100644
--- a/net/web/src/context/useCardContext.hook.js
+++ b/net/web/src/context/useCardContext.hook.js
@@ -223,7 +223,7 @@ export function useCardContext() {
   const actions = {
     setToken: (token) => {
       if (access.current || syncing.current) {
-        throw new Error("invalid session state");
+        throw new Error("invalid card session state");
       }
       access.current = token;
       cards.current = new Map();
diff --git a/net/web/src/context/useChannelContext.hook.js b/net/web/src/context/useChannelContext.hook.js
index 42bb51ac..83ba8246 100644
--- a/net/web/src/context/useChannelContext.hook.js
+++ b/net/web/src/context/useChannelContext.hook.js
@@ -104,7 +104,7 @@ export function useChannelContext() {
   const actions = {
     setToken: (token) => {
       if (access.current || syncing.current) {
-        throw new Error("invalid session state");
+        throw new Error("invalid channel session state");
       }
       access.current = token;
       channels.current = new Map();
diff --git a/net/web/src/context/useProfileContext.hook.js b/net/web/src/context/useProfileContext.hook.js
index d328f1f7..a9ed4ea1 100644
--- a/net/web/src/context/useProfileContext.hook.js
+++ b/net/web/src/context/useProfileContext.hook.js
@@ -47,7 +47,7 @@ export function useProfileContext() {
   const actions = {
     setToken: (token) => {
       if (access.current || syncing.current) {
-        throw new Error("invalid session state");
+        throw new Error("invalid profile session state");
       }
       access.current = token;
       curRevision.current = null;