Make client login/password works again...