improve user & account controllers