Fix/passwords shouldnt fill on the 4.0 branch