Fix bad regex for user-update...
Pull the templates set-up code into its own module.