Fix handling of empty password
Remove password from benchmarks