Fix the templating to use default user