MP1-4554: Fixing broken settings and port to new client.