FE User improvements