Log off bug fixed.
Merge