diff --git a/www/form/AuthidSelector.js b/www/form/AuthidSelector.js
index 9672067b..956b1fca 100644
--- a/www/form/AuthidSelector.js
+++ b/www/form/AuthidSelector.js
@@ -60,6 +60,8 @@ Ext.define('PBS.form.AuthidSelector', {
 	}
 
 	me.store.loadData(records);
+	// we need to re-set the value, ExtJS doesn't knows that we injected data into the store
+	me.setValue(me.value);
 	me.validate();
     },
 
diff --git a/www/form/TokenSelector.js b/www/form/TokenSelector.js
index 502fe827..078a19dc 100644
--- a/www/form/TokenSelector.js
+++ b/www/form/TokenSelector.js
@@ -31,6 +31,7 @@ Ext.define('PBS.form.TokenSelector', {
     },
 
     onLoad: function(store, data, success) {
+	let me = this;
 	if (!success) return;
 
 	let tokenStore = this.store;
@@ -49,6 +50,9 @@ Ext.define('PBS.form.TokenSelector', {
 	});
 
 	tokenStore.loadData(records);
+	// we need to re-set the value, ExtJS doesn't knows that we injected data into the store
+	me.setValue(me.value);
+	me.validate();
     },
 
     listConfig: {