Merge authentication dialogs

Avoid having two separate code paths for the user/password and
only password dialogs. Makes it easier to extend things in the future.
1 file changed