Simplify options

E.g.,
Use --org-login if user is not a System Administrator.