Don't show password, added TODOs