CAS-1418: Pulled out uid into a username variable