SettingsHandler - first execution behavior fix