Fixed bug when no password is used