fix missing user + split into two steps