Fix date && password fields