Better user creation handling