added chardin call out for login box
fixed merge confilicts