Fix: Several fixes for bad management of external/internal users.