Changes due to connection problems wiith passwords