cleaning up
First argument with user/pass is optional.
Somehow lost the correct implementation of this macro.