Try better handling for new repo on existing user