Fixed user and role restoration with shim