Adding in support for auto create api user, unfinished