Update checklogin
Merge