We can now register users *fanfare*
Merge branch 'martin_workbranch'