Added @tag for users and rebuilded templatesD