User authentication fix, test for fix
Merge branch 'develop' of github.com:SimonWoolf/websandbox into develop