Fix Null Credentials in ServiceClient because of changed behavior in SettingsService

References #71