I would move to Keychain if it supports multiple domain names and non-login credentials.