Fixing UX cases of Setup Profile for Edit state #824