minor updates on login handler, not working so far...