fixes #2887 - global options --username nad --password should behave consistently
Merge pull request #4 from mbacovsky/2887_global_options_u_p

fixes #2887 - global options --username nad --password