diff --git a/api/js/etemplate/Et2Select/SelectAccountMixin.ts b/api/js/etemplate/Et2Select/SelectAccountMixin.ts
index 7c390e0e29..429ad91672 100644
--- a/api/js/etemplate/Et2Select/SelectAccountMixin.ts
+++ b/api/js/etemplate/Et2Select/SelectAccountMixin.ts
@@ -96,7 +96,7 @@ export const SelectAccountMixin = <T extends Constructor<LitElement>>(superclass
 					// Not already cached, need to fetch it
 					this.egw().link_title('api-accounts', id, true).then(title =>
 					{
-						option.label = title;
+						option.label = title || '';
 						this.requestUpdate('select_options');
 					});
 				}
diff --git a/api/src/Etemplate/Widget/Select.php b/api/src/Etemplate/Widget/Select.php
index 40f946d8e2..cf84d78f4d 100644
--- a/api/src/Etemplate/Widget/Select.php
+++ b/api/src/Etemplate/Widget/Select.php
@@ -362,7 +362,7 @@ class Select extends Etemplate\Widget
 		{
 			// Check selection preference, we may be able to skip reading some data
 			$select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
-			if(!empty($this->attrs['type']) && $this->attrs['type'] === 'select-account' &&
+			if($type === 'et2-select-account' &&
 				empty($GLOBALS['egw_info']['user']['apps']['admin']) && $select_pref === 'none')
 			{
 				// Preserve but do not send the value if preference is 'none'