Added support for logged in user details. eg @@USER:LASTNAME@@