Fix some problems with white spaces in passwords