Tidying up auth-related templates
Merge pull request #499 from andrewhayward/auth

Tidying up auth-related templates