Migrate to single 401 entry