some changes on user login
merge