Improve Users controller