Add unique validator and password field