Replace E-mail with Email or username when adding existing users to a site
Move user management scripts inline, as they are very short