Add in some default values for users
Merge pull request #552 from timschofield/develop

Add in some default values for users