Merge "Fix bug in credential manager settings (dialogs)"