Fixed ${username} variable in CommonResource