edit user login info
Merge branch '13090202'