Fixed machine-specific login dependencies