Update management of username/password
Remove error placeholders