Fix dependency issues since change from class to definition for the adminpass