fixed client login issues and some syntax changes