Merge pull request #21 from simonpasquier/issue-12

Fix tags for the admin user