client authentication
merged login changes