Fix user scope and latest migration