User Creator bug fix