Tighten up users a bit more