Form error handling
Added user and changed to settings
Merge branch 'master' of https://github.com/ucam-cl-dtg/supervision-api