password field + user fix