Extract EntitySaveGuard and push UserStoreId logic out of controller