WiP: fix generation of the username and password lines