bugfix  now with password support