Fixed user/pass support