Reduced includes
First experiments to fix issues with password displays