Create user in popup fix
Merge branch 'CreateUserInPopup'