Fix log in screen
Merge commit '9d4406e5bc98610d43db17545c9747bc8add9c47' into Ken