think i fixed it this time!

fixed it so that if no username/password is specified then we wont try
and pass a blank username/pass to the broker.