Create user bugfix
Merge branch 'master' of https://github.com/jsenko/PA165