Retooling/admin style add/user stuff