Edited Create User code to work with latest master copy