Remove password and name nag