Correctly parse the credentials, initial topics and the lack of them

Hello Martin,

Remember this? Clearly I was half asleep yesterday, here is a working change.

Matt