Handler Changes

support for rusername and rspassword added