Bug fix with user creation

Important bug fix with one file, very simple merge