diff --git a/htdocs/App.vue b/htdocs/App.vue
index 63b2a65..e62b381 100644
--- a/htdocs/App.vue
+++ b/htdocs/App.vue
@@ -9,6 +9,8 @@
 </template>
 
 <script>
+	import { watchEffect } from 'vue';
+
 	import Navbar from './Navbar.vue';
 	import Login from './Login.vue';
 	import RouteSchedule from './RouteSchedule.vue';
@@ -45,8 +47,10 @@
 					].forEach(route => this.$root.$router.addRoute(route));
 					await this.$root.$router.replace(this.$route);
 				}
-				if(value) this.heartbeat = await value.heartbeat();
-				if(oldvalue) this.$router.go();	// refresh if changed
+				if(value) {
+					this.heartbeat = await value.heartbeat();
+					var stop = watchEffect(() => { if(!value.connected.value) { stop(); this.client = this.server = this.user = null; } });
+				}
 			}
 		}
 	};
diff --git a/htdocs/Login.vue b/htdocs/Login.vue
index 5c72a70..da98085 100644
--- a/htdocs/Login.vue
+++ b/htdocs/Login.vue
@@ -93,31 +93,34 @@
 		},
 		watch: {
 			host: {
-				async handler(value) {
-					this.logout();
-					this.x_client = await (value ? vistax.Client.fromCookie(this.secret, value) : vistax.Client.fromCookie(this.secret));
-					this.banner = await this.x_client.XUS_INTRO_MSG();
-					if((await this.x_client.userinfo()).result) try {
-						var user = await this.x_client.XUS_GET_USER_INFO();
-						this.x_user = user[0] ? user : null
-					} catch(ex) {
-						this.x_user = null;
-					}
-					this.$emit('update:user', this.x_user);
-					this.show = !this.x_user;
-					this.$emit('update:server', this.x_server = (await this.x_client.serverinfo()).result);
-					console.log('Backend secret', this.secret);
-					console.log(this.banner);
+				handler(value) {
+					this.connect();
 				}, immediate: true
 			},
 			client(value) { this.x_client = value; },
-			x_client(value) { this.$emit('update:client', value); },
+			x_client(value) { this.$emit('update:client', value); if(!value) this.connect(); },
 			server(value) { this.x_server = value; },
 			x_server(value) { this.$emit('update:server', value); },
 			user(value) { this.x_user = value; },
 			x_user(value) { this.$emit('update:user', value); }
 		},
 		methods: {
+			async connect() {
+				this.logout();
+				this.x_client = await (this.host ? vistax.Client.fromCookie(this.secret, this.host) : vistax.Client.fromCookie(this.secret));
+				this.banner = await this.x_client.XUS_INTRO_MSG();
+				if((await this.x_client.userinfo()).result) try {
+					var user = await this.x_client.XUS_GET_USER_INFO();
+					this.x_user = user[0] ? user : null
+				} catch(ex) {
+					this.x_user = null;
+				}
+				this.$emit('update:user', this.x_user);
+				this.show = !this.x_user;
+				this.$emit('update:server', this.x_server = (await this.x_client.serverinfo()).result);
+				console.log('Backend secret', this.secret);
+				console.log(this.banner);
+			},
 			async login(evt) {
 				if(this.x_client) {
 					var res = await ((this.accesscode && this.verifycode) ? this.x_client.authenticate(this.accesscode + ';' + this.verifycode) : this.x_client.authenticate());
diff --git a/htdocs/vistax.mjs b/htdocs/vistax.mjs
index 5bef562..a231612 100644
--- a/htdocs/vistax.mjs
+++ b/htdocs/vistax.mjs
@@ -84,13 +84,24 @@ export function Client(cid, secret) {
 
 	this.secret = secret;
 	this.cid = cid;
+	this.connected = reactive({ value: true });
 
 	this.close = function() {
+		console.log('CLOSE', cid);
 		if(heartbeat) window.clearInterval(heartbeat);
+		this.connected.value = false;
 		return vista.close(cid);
 	};
-	this.call = (method, ...params) => vista.call(cid, method, ...params);
-	this.callctx = (context, method, ...params) => vista.callctx(cid, context, method, ...params);
+	this.call = async function(method, ...params) {
+		var res = await vista.call(cid, method, ...params);
+		if((res.error) && (res.error.type == 'ConnectionResetError')) this.close();
+		return res;
+	};
+	this.callctx = async function(context, method, ...params) {
+		var res = vista.callctx(cid, context, method, ...params);
+		if((res.error) && (res.error.type == 'ConnectionResetError')) this.close();
+		return res;
+	};
 	this.heartbeat = async function(interval=null) {
 		if(!interval) interval = 0.45*1000*(await this.XWB_GET_BROKER_INFO())[0];
 		if(heartbeat) window.clearInterval(heartbeat);
@@ -101,27 +112,27 @@ export function Client(cid, secret) {
 	this.userinfo = () => vista.userinfo(cid);
 	this.authenticate = (avcode=null) => vista.authenticate(cid, avcode);
 
-	this.XWB_IM_HERE = unwrapped(logged(() => vista.call(cid, 'XWB_IM_HERE'), 'XWB_IM_HERE'));
+	this.XWB_IM_HERE = unwrapped(logged(() => this.call('XWB_IM_HERE'), 'XWB_IM_HERE'));
 
-	this.XUS_INTRO_MSG = memoized(unwrapped(logged(() => vista.callctx(cid, ['XUCOMMAND'], 'XUS_INTRO_MSG'), 'XUS_INTRO_MSG')));
-	this.XWB_GET_BROKER_INFO = memoized(unwrapped(logged(() => vista.callctx(cid, ['XUCOMMAND'], 'XWB_GET_BROKER_INFO'), 'XWB_GET_BROKER_INFO')));
-	this.XUS_GET_USER_INFO = memoized(unwrapped(logged(() => vista.call(cid, 'XUS_GET_USER_INFO'), 'XUS_GET_USER_INFO')));
+	this.XUS_INTRO_MSG = memoized(unwrapped(logged(() => this.callctx(['XUCOMMAND'], 'XUS_INTRO_MSG'), 'XUS_INTRO_MSG')));
+	this.XWB_GET_BROKER_INFO = memoized(unwrapped(logged(() => this.callctx(['XUCOMMAND'], 'XWB_GET_BROKER_INFO'), 'XWB_GET_BROKER_INFO')));
+	this.XUS_GET_USER_INFO = memoized(unwrapped(logged(() => this.call('XUS_GET_USER_INFO'), 'XUS_GET_USER_INFO')));
 
-	this.SDEC_RESOURCE = memoized(unwrapped(logged(() => vista.callctx(cid, ['SDECRPC'], 'SDEC_RESOURCE'), 'SDEC_RESOURCE')));
-	this.SDEC_CLINLET = memoized(unwrapped(logged((...args) => vista.callctx(cid, ['SDECRPC'], 'SDEC_CLINLET', ...args), 'SDEC_CLINLET')));
+	this.SDEC_RESOURCE = memoized(unwrapped(logged(() => this.callctx(['SDECRPC'], 'SDEC_RESOURCE'), 'SDEC_RESOURCE')));
+	this.SDEC_CLINLET = memoized(unwrapped(logged((...args) => this.callctx(['SDECRPC'], 'SDEC_CLINLET', ...args), 'SDEC_CLINLET')));
 
-	this.ORWPT_FULLSSN = memoized(caretseparated(unwrapped(logged((...args) => vista.callctx(cid, ['OR CPRS GUI CHART'], 'ORWPT_FULLSSN', ...args), 'ORWPT_FULLSSN')), ['dfn', 'name', 'date', 'pid']));
-	this.ORWPT_LAST5 = memoized(caretseparated(unwrapped(logged((...args) => vista.callctx(cid, ['OR CPRS GUI CHART'], 'ORWPT_LAST5', ...args), 'ORWPT_LAST5')), ['dfn', 'name', 'date', 'pid']));
-	this.ORWPT_ID_INFO = memoized(caretseparated1(unwrapped(logged((...args) => vista.callctx(cid, ['OR CPRS GUI CHART'], 'ORWPT_ID_INFO', ...args), 'ORWPT_ID_INFO')), ['pid', 'dob', 'sex', 'vet', 'sc_percentage', 'ward', 'room_bed', 'name']));
-	this.ORWPT16_LOOKUP = memoized(caretseparated(unwrapped(logged((...args) => vista.callctx(cid, ['OR CPRS GUI CHART'], 'ORWPT16_LOOKUP', ...args), 'ORWPT16_LOOKUP')), ['dfn', 'name', 'pid']));
-	this.ORWPT16_ID_INFO = memoized(caretseparated1(unwrapped(logged((...args) => vista.callctx(cid, ['OR CPRS GUI CHART'], 'ORWPT16_ID_INFO', ...args), 'ORWPT16_ID_INFO')), ['pid', 'dob', 'age', 'sex', 'sc_percentage', 'type', 'ward', 'room_bed', 'name']));
+	this.ORWPT_FULLSSN = memoized(caretseparated(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT_FULLSSN', ...args), 'ORWPT_FULLSSN')), ['dfn', 'name', 'date', 'pid']));
+	this.ORWPT_LAST5 = memoized(caretseparated(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT_LAST5', ...args), 'ORWPT_LAST5')), ['dfn', 'name', 'date', 'pid']));
+	this.ORWPT_ID_INFO = memoized(caretseparated1(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT_ID_INFO', ...args), 'ORWPT_ID_INFO')), ['pid', 'dob', 'sex', 'vet', 'sc_percentage', 'ward', 'room_bed', 'name']));
+	this.ORWPT16_LOOKUP = memoized(caretseparated(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT16_LOOKUP', ...args), 'ORWPT16_LOOKUP')), ['dfn', 'name', 'pid']));
+	this.ORWPT16_ID_INFO = memoized(caretseparated1(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT16_ID_INFO', ...args), 'ORWPT16_ID_INFO')), ['pid', 'dob', 'age', 'sex', 'sc_percentage', 'type', 'ward', 'room_bed', 'name']));
 
-	this.ORQQVI_VITALS = memoized(caretseparated(unwrapped(logged((...args) => vista.callctx(cid, ['OR CPRS GUI CHART'], 'ORQQVI_VITALS', ...args), 'ORQQVI_VITALS')), ['measurement_ien', 'type', 'value', 'datetime', 'value_american', 'value_metric']));
-	this.ORQQVI_VITALS_FOR_DATE_RANGE = memoized(caretseparated(unwrapped(logged((...args) => vista.callctx(cid, ['OR CPRS GUI CHART'], 'ORQQVI_VITALS_FOR_DATE_RANGE', ...args), 'ORQQVI_VITALS_FOR_DATE_RANGE')), ['measurement_ien', 'type', 'value', 'datetime']));
+	this.ORQQVI_VITALS = memoized(caretseparated(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORQQVI_VITALS', ...args), 'ORQQVI_VITALS')), ['measurement_ien', 'type', 'value', 'datetime', 'value_american', 'value_metric']));
+	this.ORQQVI_VITALS_FOR_DATE_RANGE = memoized(caretseparated(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORQQVI_VITALS_FOR_DATE_RANGE', ...args), 'ORQQVI_VITALS_FOR_DATE_RANGE')), ['measurement_ien', 'type', 'value', 'datetime']));
 
-	this.GMV_EXTRACT_REC = memoized(async (dfn, oredt, orsdt) => measurement_parse(await unwrapped(logged((...args0) => vista.callctx(cid, ['OR CPRS GUI CHART'], 'GMV_EXTRACT_REC', args0.join('^')), 'GMV_EXTRACT_REC'))(dfn, oredt, '', orsdt)));
+	this.GMV_EXTRACT_REC = memoized(async (dfn, oredt, orsdt) => measurement_parse(await unwrapped(logged((...args0) => this.callctx(['OR CPRS GUI CHART'], 'GMV_EXTRACT_REC', args0.join('^')), 'GMV_EXTRACT_REC'))(dfn, oredt, '', orsdt)));
 
-	this.ORWLRR_INTERIM = memoized(labreportparsed(unwrapped(logged((...args) => vista.callctx(cid, ['OR CPRS GUI CHART'], 'ORWLRR_INTERIM', ...args), 'ORWLRR_INTERIM'))));
+	this.ORWLRR_INTERIM = memoized(labreportparsed(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWLRR_INTERIM', ...args), 'ORWLRR_INTERIM'))));
 	this.ORWLRR_INTERIM_RESULTS = memoized(async (...args) => lab_reparse_results(await this.ORWLRR_INTERIM(...args)));
 
 	return this;