Some UserAccount workflow fixes