proper registration of MS functionality when enabled