Add credentials support
Fix fmpp pasta relics spotted by @gseitz