fixed a merge issue
minor
still having trouble with double logon attempt