Added check and fix for when profile deleted, but new one not set