merge user login with master
add user login path